converting images to PNG
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 15 Feb 2013 12:46:05 +0000 (16:46 +0400)
committerAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 15 Feb 2013 12:46:30 +0000 (16:46 +0400)
samples/java/sbt/src/main/resources/img1.bmp [deleted file]
samples/java/sbt/src/main/resources/img1.png [new file with mode: 0644]
samples/java/sbt/src/main/resources/img2.bmp [deleted file]
samples/java/sbt/src/main/resources/img2.png [new file with mode: 0644]
samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala

diff --git a/samples/java/sbt/src/main/resources/img1.bmp b/samples/java/sbt/src/main/resources/img1.bmp
deleted file mode 100644 (file)
index f239370..0000000
Binary files a/samples/java/sbt/src/main/resources/img1.bmp and /dev/null differ
diff --git a/samples/java/sbt/src/main/resources/img1.png b/samples/java/sbt/src/main/resources/img1.png
new file mode 100644 (file)
index 0000000..93cd594
Binary files /dev/null and b/samples/java/sbt/src/main/resources/img1.png differ
diff --git a/samples/java/sbt/src/main/resources/img2.bmp b/samples/java/sbt/src/main/resources/img2.bmp
deleted file mode 100644 (file)
index ac323fa..0000000
Binary files a/samples/java/sbt/src/main/resources/img2.bmp and /dev/null differ
diff --git a/samples/java/sbt/src/main/resources/img2.png b/samples/java/sbt/src/main/resources/img2.png
new file mode 100644 (file)
index 0000000..41959c6
Binary files /dev/null and b/samples/java/sbt/src/main/resources/img2.png differ
index da455e5c23818e294c6c4e3c20fb4090cd5f12b4..30ab0553e3025e6657f1739c970571fd2781bad0 100644 (file)
@@ -45,8 +45,8 @@ object ScalaCorrespondenceMatchingDemo {
     }
 
     // Load the images from the |resources| directory.
-    val leftImage = Highgui.imread(getClass.getResource("/img1.bmp").getPath)
-    val rightImage = Highgui.imread(getClass.getResource("/img2.bmp").getPath)
+    val leftImage = Highgui.imread(getClass.getResource("/img1.png").getPath)
+    val rightImage = Highgui.imread(getClass.getResource("/img2.png").getPath)
 
     // Detect KeyPoints and extract descriptors.
     val (leftKeyPoints, leftDescriptors) = detectAndExtract(leftImage)