Ensure that ImageTransforms are applied in all cases (this was patchy

before; some features did & some didn't!)
openimaj · Aug 10, 2017 · ee56d60 · ee56d60
1 parent 64cffde
commit ee56d60
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/...lFeaturesTool/src/main/java/org/openimaj/tools/localfeature/options/LocalFeatureMode.java b/...lFeaturesTool/src/main/java/org/openimaj/tools/localfeature/options/LocalFeatureMode.java
@@ -67,7 +67,7 @@
 
 /**
  * Types of local feature
- * 
+ *
  * @author Jonathon Hare (jsh2@ecs.soton.ac.uk)
  */
 public enum LocalFeatureMode implements CmdLineOptionsProvider {
@@ -151,12 +151,12 @@ public LocalFeatureModeOp getOptions() {
 
 	/**
 	 * Associated options for each {@link LocalFeatureMode}.
-	 * 
+	 *
 	 * @author Jonathon Hare (jsh2@ecs.soton.ac.uk)
 	 */
 	public static abstract class LocalFeatureModeOp
 			implements
-			LocalFeatureExtractor<LocalFeature<?, ?>, MBFImage>
+				LocalFeatureExtractor<LocalFeature<?, ?>, MBFImage>
 	{
 		private LocalFeatureMode mode;
 
@@ -171,7 +171,7 @@ public static abstract class LocalFeatureModeOp
 
 		/**
 		 * Extract features based on the options.
-		 * 
+		 *
 		 * @param image
 		 *            the image
 		 * @return the features
@@ -200,7 +200,7 @@ public LocalFeatureMode getMode() {
 
 	/**
 	 * Associated options for things built on a {@link DoGSIFTEngine}.
-	 * 
+	 *
 	 * @author Jonathon Hare (jsh2@ecs.soton.ac.uk)
 	 */
 	public static abstract class AbstractDoGSIFTModeOp extends LocalFeatureModeOp {
@@ -282,7 +282,7 @@ public LocalFeatureList<? extends Keypoint> extract(byte[] img) throws IOExcepti
 			switch (this.cm) {
 			case SINGLE_COLOUR:
 			case INTENSITY:
-				keys = engine.findFeatures((FImage) cmOp.process(img));
+				keys = engine.findFeatures((FImage) itOp.transform(cmOp.process(img)));
 				break;
 			case INTENSITY_COLOUR:
 				throw new UnsupportedOperationException();
@@ -292,6 +292,7 @@ public LocalFeatureList<? extends Keypoint> extract(byte[] img) throws IOExcepti
 
 		@Override
 		public LocalFeatureList<? extends Keypoint> extractFeature(MBFImage img) {
+			img = (MBFImage) this.itOp.transform(img);
 			final MinMaxDoGSIFTEngine engine = new MinMaxDoGSIFTEngine();
 			LocalFeatureList<MinMaxKeypoint> keys = null;
 			switch (this.cm) {
@@ -517,6 +518,8 @@ private DenseSiftMode(LocalFeatureMode mode) {
 		}
 
 		LocalFeatureList<? extends LocalFeature<?, ?>> extract(FImage image) {
+			image = (FImage) this.itOp.transform(image);
+
 			final DenseSIFT dsift;
 
 			if (approximate)
@@ -562,6 +565,8 @@ private static class ColourDenseSiftMode extends DenseSiftMode {
 
 		@Override
 		public LocalFeatureList<? extends LocalFeature<?, ?>> extractFeature(MBFImage image) {
+			image = (MBFImage) this.itOp.transform(image);
+
 			final ColourDenseSIFT dsift;
 
 			if (approximate)
@@ -626,6 +631,8 @@ protected int[] toArray(List<Integer> in) {
 		}
 
 		LocalFeatureList<? extends LocalFeature<?, ?>> extractFeature(FImage image) {
+			image = (FImage) this.itOp.transform(image);
+
 			final PyramidDenseSIFT<FImage> dsift;
 
 			if (approximate)
@@ -672,6 +679,8 @@ private static class PyramidColourDenseSiftMode extends PyramidDenseSiftMode {
 
 		@Override
 		public LocalFeatureList<? extends LocalFeature<?, ?>> extractFeature(MBFImage image) {
+			image = (MBFImage) this.itOp.transform(image);
+
 			final PyramidDenseSIFT<MBFImage> dsift;
 
 			if (approximate)