null image input & output

CMakeLists.txt

@@ -237,7 +237,7 @@ oiio_add_tests (
                 dither dup-channels
                 dpx ico iff
                 jpeg-corrupt-exif
-                png
+                null png
                 psd psd-colormodes
                 rla sgi
                 rational

src/libOpenImageIO/imageioplugin.cpp

@@ -243,6 +243,7 @@ catalog_plugin (const std::string &format_name,
     PLUGENTRY (iff);
     PLUGENTRY (jpeg);
     PLUGENTRY (jpeg2000);
+    PLUGENTRY (null);
     PLUGENTRY (openexr);
     PLUGENTRY (png);
     PLUGENTRY (pnm);
@@ -311,6 +312,7 @@ catalog_builtin_plugins ()
 #ifdef USE_OPENJPEG
     DECLAREPLUG (jpeg2000);
 #endif
+    DECLAREPLUG (null);
     DECLAREPLUG (openexr);
     DECLAREPLUG (png);
     DECLAREPLUG (pnm);
@@ -472,17 +474,30 @@ ImageInput::create (const std::string &filename,
 
 
 ImageInput *
-ImageInput::create (const std::string &filename, 
+ImageInput::create (const std::string &filename,
                     bool do_open,
                     const std::string &plugin_searchpath)
 {
-    if (filename.empty()) { // Can't even guess if no filename given
+    // In case the 'filename' was really a REST-ful URI with query/config
+    // details tacked on to the end, strip them off so we can correctly
+    // extract the file extension.
+    std::map<std::string,std::string> args;
+    std::string filename_stripped;
+    if (! Strutil::get_rest_arguments (filename, filename_stripped, args)) {
+        pvt::error ("ImageInput::create() called with malformed filename");
+        return nullptr;
+    }
+
+    if (filename_stripped.empty())
+        filename_stripped = filename;
+
+    if (filename_stripped.empty()) { // Can't even guess if no filename given
         pvt::error ("ImageInput::create() called with no filename");
         return NULL;
     }
 
     // Extract the file extension from the filename (without the leading dot)
-    std::string format = Filesystem::extension (filename, false);
+    std::string format = Filesystem::extension (filename_stripped, false);
     if (format.empty()) {
         // If the file had no extension, maybe it was itself the format name
         format = filename;

src/libutil/filesystem.cpp

@@ -627,6 +627,8 @@ Filesystem::read_bytes (string_view path, void *buffer, size_t n, size_t pos)
 std::time_t
 Filesystem::last_write_time (const std::string& path)
 {
+    if (! exists(path))
+        return 0;
     try {
 #ifdef _WIN32
         std::wstring wpath = Strutil::utf8_to_utf16 (path);
@@ -645,6 +647,8 @@ Filesystem::last_write_time (const std::string& path)
 void
 Filesystem::last_write_time (const std::string& path, std::time_t time)
 {
+    if (! exists(path))
+        return;
     try {
 #ifdef _WIN32
         std::wstring wpath = Strutil::utf8_to_utf16 (path);
@@ -662,6 +666,8 @@ Filesystem::last_write_time (const std::string& path, std::time_t time)
 uint64_t
 Filesystem::file_size (string_view path)
 {
+    if (! exists(path))
+        return 0;
     try {
 #ifdef _WIN32
         std::wstring wpath = Strutil::utf8_to_utf16 (path);

src/null.imageio/CMakeLists.txt

@@ -0,0 +1 @@
+add_oiio_plugin (nullimageio.cpp)