Merge pull request #202 from aous72/a_few_pr

Improves installation of the library.
Adds a new way to read the mem_file file size.

Author: aous72

src/core/CMakeLists.txt

@@ -137,7 +137,7 @@ endif()
 ## include library version/name
 set_target_properties(openjph PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_compile_definitions(openjph PUBLIC _FILE_OFFSET_BITS=64)
-target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include/openjph>)
+target_include_directories(openjph PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/common> $<INSTALL_INTERFACE:include>)
 
 if (MSVC)
   set(OJPH_LIB_NAME_STRING "openjph.${OPENJPH_VERSION_MAJOR}.${OPENJPH_VERSION_MINOR}")

src/core/codestream/ojph_params_local.h

@@ -1085,6 +1085,7 @@ namespace ojph {
         avail = NULL;
         d = d_store;
         max_steps = sizeof(d_store) / sizeof(lifting_step);
+        this->top_atk = top_atk;
         this->type = type;
         init(this);
       }
@@ -1162,7 +1163,7 @@ namespace ojph {
       float Katk;        // only for irreversible scaling factor K
       ui8 Natk;          // number of lifting steps
       lifting_step* d;   // pointer to data, initialized to d_store
-      int max_steps;     // maximum number of steps without memory allocation
+      ui32 max_steps;    // maximum number of steps without memory allocation
       lifting_step d_store[6];   // lifting step coefficient
       param_atk* next;   // used for chaining if more than one atk segment
                          // exist in the codestream

src/core/common/ojph_file.h

@@ -203,6 +203,21 @@ namespace ojph {
      */
     void write_to_file(const char *file_name) const;
 
+    /**
+     *  @brief Call this function to get the used size of the memory file.
+     *
+     *  @return the used size of the memory file in bytes.
+     */
+    size_t get_used_size() const { return used_size; }
+
+    /**
+     *  @brief Call this function to get the total buffer size of the memory
+     *         file including unused space (this is the allocated memory).
+     *
+     *  @return the full size of the memory file in bytes.
+     */
+     size_t get_buf_size() const { return buf_size; }
+
   private:
     /**
      *  @brief This function expands storage by x1.5 needed space.

src/core/common/ojph_version.h

@@ -34,5 +34,5 @@
 //***************************************************************************/
 
 #define OPENJPH_VERSION_MAJOR 0
-#define OPENJPH_VERSION_MINOR 22
+#define OPENJPH_VERSION_MINOR 23
 #define OPENJPH_VERSION_PATCH 0

src/openjph.pc.in

@@ -1,9 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@PKG_CONFIG_LIBDIR@
+includedir=@PKG_CONFIG_INCLUDEDIR@
+
 Name: @PROJECT_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
 Requires: @PKG_CONFIG_REQUIRES@
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=@PKG_CONFIG_INCLUDEDIR@
-libdir=@PKG_CONFIG_LIBDIR@
 Libs: -L${libdir} -lopenjph
-Cflags: -I${includedir}
+Cflags: -I${includedir} -D_FILE_OFFSET_BITS=64