Fixing QOI read/write to support Wide file names on MSW

Author: andrewfb

src/cinder/ImageSourceFileQoi.cpp

@@ -22,11 +22,52 @@
 */
 
 #include "cinder/ImageSourceFileQoi.h"
+#define QOI_NO_STDIO
 #define QOI_IMPLEMENTATION
 #include "qoi/qoi.h"
 
+#include <cstdio>
+#include <cstdlib>
+
 namespace cinder {
 
+namespace {
+
+// Cross-platform wrapper for qoi_read that handles Unicode paths properly
+void* qoiReadPath( const fs::path &path, qoi_desc *desc, int channels )
+{
+#if defined( CINDER_MSW )
+	FILE *f = _wfopen( path.wstring().c_str(), L"rb" );
+#else
+	FILE *f = fopen( path.string().c_str(), "rb" );
+#endif
+
+	if( ! f )
+		return nullptr;
+
+	fseek( f, 0, SEEK_END );
+	int size = ftell( f );
+	if( size <= 0 || fseek( f, 0, SEEK_SET ) != 0 ) {
+		fclose( f );
+		return nullptr;
+	}
+
+	void *data = malloc( size );
+	if( ! data ) {
+		fclose( f );
+		return nullptr;
+	}
+
+	int bytesRead = (int)fread( data, 1, size, f );
+	fclose( f );
+
+	void *pixels = ( bytesRead != size ) ? nullptr : qoi_decode( data, bytesRead, desc, channels );
+	free( data );
+	return pixels;
+}
+
+} // anonymous namespace
+
 ///////////////////////////////////////////////////////////////////////////////
 // Registrar
 void ImageSourceFileQoi::registerSelf()
@@ -52,7 +93,7 @@ ImageSourceFileQoi::ImageSourceFileQoi( DataSourceRef dataSourceRef, ImageSource
 	int channels = 0;
 
 	if( dataSourceRef->isFilePath() ) {
-		mData = (uint8_t*)qoi_read( dataSourceRef->getFilePath().string().c_str(), &desc, 0 );
+		mData = (uint8_t*)qoiReadPath( dataSourceRef->getFilePath(), &desc, 0 );
 		if( ! mData )
 			throw ImageIoExceptionFailedLoad( "Failed to load QOI image" );
 

src/cinder/ImageTargetFileQoi.cpp

@@ -26,14 +26,50 @@
 
 // Note: QOI_IMPLEMENTATION is defined in ImageSourceFileQoi.cpp
 // to avoid multiple definition errors
+#define QOI_NO_STDIO
 #include "qoi/qoi.h"
 
+#include <cstdio>
+#include <cstdlib>
+
 namespace cinder {
 
+namespace {
+
+// Cross-platform wrapper for qoi_write that handles Unicode paths properly
+int qoiWritePath( const fs::path &path, const void *data, const qoi_desc *desc )
+{
+#if defined( CINDER_MSW )
+	FILE *f = _wfopen( path.wstring().c_str(), L"wb" );
+#else
+	FILE *f = fopen( path.string().c_str(), "wb" );
+#endif
+
+	if( ! f )
+		return 0;
+
+	int size;
+	void *encoded = qoi_encode( data, desc, &size );
+	if( ! encoded ) {
+		fclose( f );
+		return 0;
+	}
+
+	fwrite( encoded, 1, size, f );
+	fflush( f );
+	int err = ferror( f );
+	fclose( f );
+
+	free( encoded );
+	return err ? 0 : size;
+}
+
+} // anonymous namespace
+
 void ImageTargetFileQoi::registerSelf()
 {
 	static bool alreadyRegistered = false;
-	const int32_t PRIORITY = 2;
+	const int32_t PRIORITY = 1;
 
 	if( alreadyRegistered )
 		return;
@@ -92,7 +128,7 @@ void ImageTargetFileQoi::finalize()
 	desc.colorspace = QOI_SRGB;
 
 	if( ! mFilePath.empty() ) {
-		if( ! qoi_write( mFilePath.string().c_str(), mData.get(), &desc ) )
+		if( ! qoiWritePath( mFilePath, mData.get(), &desc ) )
 			throw ImageIoExceptionFailedWrite( "Failed to write QOI image" );
 	}
 	else {