Fix broken writing of E57 files

Introduced in 0601045
asmaloney · Jan 15, 2019 · a6f2845 · a6f2845
1 parent 7945868
commit a6f2845
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 libE57Format
 ==
-- v2.0 (06 Jan 2019)
+- v2.0.1 (15 Jan 2019)
+  - writing files was broken and would produce the following error:
+    Error: bad API function argument provided by user (E57_ERROR_BAD_API_ARGUMENT) (ImageFileImpl.cpp line 109)
+
+- v2.0 (06 Jan 2019)
   - forked from E57RefImpl
   - removed all but the main sources for reading and writing E57 files
   - now requires C++11

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,6 +46,7 @@ project(E57Format)
 # developer adjustable version numbers
 set(${PROJECT_NAME}_MAJOR_VERSION 2)
 set(${PROJECT_NAME}_MINOR_VERSION 0)
+set(${PROJECT_NAME}_PATCH_VERSION 1)
 
 include(Tags)
 
@@ -92,7 +93,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
     add_definitions(-DWINDOWS)
 endif()
 
-add_definitions(-DREVISION_ID="${PROJECT_NAME}-${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}-${${PROJECT_NAME}_BUILD_TAG}")
+add_definitions(-DREVISION_ID="${PROJECT_NAME}-${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_VERSION}-${${PROJECT_NAME}_BUILD_TAG}")
 
 include_directories(
     ${PROJECT_BINARY_DIR}/include

diff --git a/src/ImageFileImpl.cpp b/src/ImageFileImpl.cpp
@@ -104,7 +104,7 @@ namespace e57
       // Accept "w" or "r" modes
       isWriter_ = (mode == "w");
 
-      if (mode != "r")
+      if ( !isWriter_ && (mode != "r") )
       {
          throw E57_EXCEPTION2(E57_ERROR_BAD_API_ARGUMENT, "mode=" + ustring(mode));
       }