Merge remote-tracking branch 'origin/master'

Author: memoakten

README.md

@@ -231,8 +231,8 @@ Instructions in the protobuf README https://github.com/google/protobuf/blob/mast
 Here are some outstanding issues and misc notes.
 
 
-## No image load! - See UPDATE below
-ofImage.load doesn't work for some reason. FreeImage_Load fails. Neither does cvLoadImage (or cv::imread). If I don't use tensorflow, it works. If I use tensorflow, it doesn't. Just fails silently. Needs serious investigation. (So for the inception demo, I had to test it by converting jpgs to raw data in gimp and load them via ofBuffers :/)
+## Jpegs don't load! - See UPDATE below
+ofImage.load doesn't work with jpegs for some reason. FreeImage_Load fails. Neither does cvLoadImage (or cv::imread). If I don't use tensorflow, it works. If I use tensorflow, it doesn't. Just fails silently. Needs serious investigation. PNGs work fine. 
 
 ## No system dialogs - see UPDATE below
 Whatever it is that implements ofSystemDialog, was compiled with protobuf 2.6.1 whereas tensorflow needs protobuf>3.0.0 (not released yet, using dev version). So can't use ofSystemDialogs. Also needs investigation. 

example-inception3/src/example-inception3.cpp

@@ -14,16 +14,6 @@
 #include "ofxMSATensorFlow.h"
 
 
-//--------------------------------------------------------------
-// ofImage::load() (ie. Freeimage load) doesn't work with TensorFlow! (See README.md)
-// so I have to resort to this awful trick of loading raw image data 299x299 RGB
-static void loadImageRaw(string path, ofImage &img, int w, int h) {
-    ofFile file(path);
-    img.setFromPixels((unsigned char*)file.readToBuffer().getData(), w, h, OF_IMAGE_COLOR);
-}
-
-
-
 class ofApp : public ofBaseApp {
 public:
 
@@ -45,19 +35,15 @@ class ofApp : public ofBaseApp {
     //--------------------------------------------------------------
     void loadNextImage() {
         static int file_index = 0;
-        ofImage img;
-
         // System load dialog doesn't work with tensorflow :(
         //auto o = ofSystemLoadDialog("Select image");
         //if(!o.bSuccess) return;
 
-        // FreeImage doesn't work with tensorflow! :(
-        //img.load("images/fanboy.jpg");
-
-        // resorting to awful raw data file load hack!
-        loadImageRaw(image_dir.getPath(file_index), img, 299, 299);
+        // only PNGs work for some reason when Tensorflow is linked in
+        ofImage img;
+        img.load(image_dir.getPath(file_index));
+        if(img.isAllocated()) classify(img.getPixels());
 
-        classify(img.getPixels());
         file_index = (file_index+1) % image_dir.getFiles().size();
     }
 
@@ -126,8 +112,11 @@ class ofApp : public ofBaseApp {
             ofSetColor(255);
 
             // if video grabber active, draw in bottom left corner
-            if(video_grabber) video_grabber->draw(0, ofGetHeight() - 240, 320, 240);
-
+            if(video_grabber) {
+                int vy = ofGetHeight() - 240;
+                ofDrawBitmapString("Press SPACE to classify", 10, vy - 10);
+                video_grabber->draw(0, vy, 320, 240);
+            }
 
             float x = 0;
 
@@ -174,7 +163,7 @@ class ofApp : public ofBaseApp {
 
         stringstream str_inst;
         str_inst << "'l' to load image\n";
-        str_inst << "or drag an image (must be raw, 299x299) onto the window\n";
+        str_inst << "or drag an image (must be PNG) onto the window\n";
         str_inst << "'v' to toggle video input";
         ofDrawBitmapString(str_inst.str(), 15, classifier.getHeight() + 30);
     }
@@ -202,12 +191,12 @@ class ofApp : public ofBaseApp {
     void dragEvent(ofDragInfo dragInfo){
         if(dragInfo.files.empty()) return;
 
-        ofImage img;
+        string file_path = dragInfo.files[0];
 
-        string filePath = dragInfo.files[0];
-        //img.load(filePath);  // FreeImage doesn't work :(
-        loadImageRaw(filePath, img, 299, 299);
-        classify(img.getPixels());
+        // only PNGs work for some reason when Tensorflow is linked in
+        ofImage img;
+        img.load(file_path);
+        if(img.isAllocated()) classify(img.getPixels());
     }
 
 };