fixup wstring functions to use fs::path

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

include/exiv2/image.hpp

@@ -527,7 +527,7 @@ class EXIV2API ImageFactory {
    */
   static BasicIo::UniquePtr createIo(const std::string& path, bool useCurl = true);
 #ifdef _WIN32
-  static BasicIo::UniquePtr createIo(const std::wstring& path);
+  static BasicIo::UniquePtr createIo(const std::wstring& path, bool useCurl = true);
 #endif
   /*!
     @brief Create an Image subclass of the appropriate type by reading
@@ -544,7 +544,7 @@ class EXIV2API ImageFactory {
    */
   static Image::UniquePtr open(const std::string& path, bool useCurl = true);
 #ifdef _WIN32
-  static Image::UniquePtr open(const std::wstring& path);
+  static Image::UniquePtr open(const std::wstring& path, bool useCurl = true);
 #endif
   /*!
     @brief Create an Image subclass of the appropriate type by reading
@@ -619,6 +619,9 @@ class EXIV2API ImageFactory {
     @return %Image type or Image::none if the type is not recognized.
    */
   static ImageType getType(const std::string& path);
+#ifdef _WIN32
+  static ImageType getType(const std::wstring& path);
+#endif
   /*!
     @brief Returns the image type of the provided data buffer.
     @param data Pointer to a data buffer containing an image. The contents

src/image.cpp

@@ -763,6 +763,17 @@ ImageType ImageFactory::getType([[maybe_unused]] const std::string& path) {
 #endif
 }
 
+#ifdef _WIN32
+ImageType ImageFactory::getType([[maybe_unused]] const std::wstring& path) {
+#ifdef EXV_ENABLE_FILESYSTEM
+  FileIo fileIo(path);
+  return getType(fileIo);
+#else
+  return ImageType::none;
+#endif
+}
+#endif
+
 ImageType ImageFactory::getType(const byte* data, size_t size) {
   MemIo memIo(data, size);
   return getType(memIo);
@@ -806,7 +817,7 @@ BasicIo::UniquePtr ImageFactory::createIo(const std::string& path, [[maybe_unuse
 }  // ImageFactory::createIo
 
 #ifdef _WIN32
-BasicIo::UniquePtr ImageFactory::createIo(const std::wstring& path) {
+BasicIo::UniquePtr ImageFactory::createIo(const std::wstring& path, bool) {
 #ifdef EXV_ENABLE_FILESYSTEM
   return std::make_unique<FileIo>(path);
 #else
@@ -823,8 +834,8 @@ Image::UniquePtr ImageFactory::open(const std::string& path, bool useCurl) {
 }
 
 #ifdef _WIN32
-Image::UniquePtr ImageFactory::open(const std::wstring& path) {
-  auto image = open(ImageFactory::createIo(path));  // may throw
+Image::UniquePtr ImageFactory::open(const std::wstring& path, bool useCurl) {
+  auto image = open(ImageFactory::createIo(path, useCurl));  // may throw
   if (!image) {
     char t[1024];
     WideCharToMultiByte(CP_UTF8, 0, path.c_str(), -1, t, 1024, nullptr, nullptr);

unitTests/test_ImageFactory.cpp

@@ -100,45 +100,45 @@ TEST(TheImageFactory, cannotCreateInstancesForSomeTypesInFiles) {
 TEST(TheImageFactory, loadInstancesDifferentImageTypes) {
   fs::path testData(TESTDATA_PATH);
 
-  std::string imagePath = (testData / "DSC_3079.jpg").string();
+  fs::path imagePath = testData / "DSC_3079.jpg";
   EXPECT_EQ(ImageType::jpeg, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "exiv2-bug1108.exv").string();
+  imagePath = testData / "exiv2-bug1108.exv";
   EXPECT_EQ(ImageType::exv, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "exiv2-canon-powershot-s40.crw").string();
+  imagePath = testData / "exiv2-canon-powershot-s40.crw";
   EXPECT_EQ(ImageType::crw, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "exiv2-bug1044.tif").string();
+  imagePath = testData / "exiv2-bug1044.tif";
   EXPECT_EQ(ImageType::tiff, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
 #ifdef EXV_HAVE_LIBZ
-  imagePath = (testData / "exiv2-bug1074.png").string();
+  imagePath = testData / "exiv2-bug1074.png";
   EXPECT_EQ(ImageType::png, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 #endif
 
-  imagePath = (testData / "BlueSquare.xmp").string();
+  imagePath = testData / "BlueSquare.xmp";
   EXPECT_EQ(ImageType::xmp, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "exiv2-photoshop.psd").string();
+  imagePath = testData / "exiv2-photoshop.psd";
   EXPECT_EQ(ImageType::psd, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "cve_2017_1000126_stack-oob-read.webp").string();
+  imagePath = testData / "cve_2017_1000126_stack-oob-read.webp";
   EXPECT_EQ(ImageType::webp, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "imagemagick.pgf").string();
+  imagePath = testData / "imagemagick.pgf";
   EXPECT_EQ(ImageType::pgf, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 
-  imagePath = (testData / "Reagan.jp2").string();
+  imagePath = testData / "Reagan.jp2";
   EXPECT_EQ(ImageType::jp2, ImageFactory::getType(imagePath));
   EXPECT_NO_THROW(ImageFactory::open(imagePath, false));
 }