static libs

Core/src/org/sleuthkit/autopsy/modules/pictureanalyzer/impls/HeifJNI.java

@@ -32,11 +32,11 @@ public class HeifJNI {
      */
     public static HeifJNI getInstance() throws UnsatisfiedLinkError {
         if (instance == null) {
-            System.loadLibrary("libx265");
-            System.loadLibrary("libde265");
-            System.loadLibrary("heif");
-            System.loadLibrary("jpeg62");
-            System.loadLibrary("heif-convert");
+//            System.loadLibrary("libx265");
+//            System.loadLibrary("libde265");
+//            System.loadLibrary("heif");
+//            System.loadLibrary("jpeg62");
+            System.loadLibrary("heifconvert");
             instance = new HeifJNI();
         }
         return instance;

thirdparty/libheif/HeifConvertJNI/CMakeLists.txt

@@ -0,0 +1,97 @@
+# Can be called with something like cmake -G "Visual Studio 17 2022" -A x64 -S .. "-DCMAKE_TOOLCHAIN_FILE=C:/Users/gregd/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_TARGET_TRIPLET=x64-windows-static
+
+cmake_minimum_required (VERSION 3.15)
+cmake_policy(SET CMP0091 NEW)
+
+project ("heifconvert")
+
+find_package(libde265 CONFIG REQUIRED)
+find_package(libheif CONFIG REQUIRED)
+find_package(JPEG REQUIRED)
+find_package(Java REQUIRED)
+
+# add_compile_definitions(LIBDE265_STATIC_BUILD LIBHEIF_STATIC_BUILD)
+
+message("JAVA_HOME = $ENV{JAVA_HOME}")
+message("Java_JAVA_EXECUTABLE = ${Java_JAVA_EXECUTABLE}")
+message("Java_JAVAC_EXECUTABLE = ${Java_JAVAC_EXECUTABLE}")
+message("Java_JAVAH_EXECUTABLE = ${Java_JAVAH_EXECUTABLE}")
+message("Java_JAVADOC_EXECUTABLE = ${Java_JAVADOC_EXECUTABLE}")
+message("Java_VERSION_STRING = ${Java_VERSION_STRING}")
+message("Java_VERSION = ${Java_VERSION}")
+
+find_package(JNI)
+
+if (JNI_FOUND)
+    message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
+    message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
+endif()
+
+add_compile_options(/std:c++latest)
+
+set (heif_convert_sources
+  encoder.cc
+  encoder.h
+  encoder_jpeg.cc
+  encoder_jpeg.h
+  org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.cc
+  org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.h
+)
+
+set (additional_link_directories)
+set (additional_libraries
+  heif
+  ${JPEG_LIBRARIES}
+)
+set (additional_includes
+  ${JNI_INCLUDE_DIRS}
+  ${JPEG_INCLUDE_DIRS}
+  ${JPEG_INCLUDE_DIR}
+)
+
+include (${CMAKE_ROOT}/Modules/FindJPEG.cmake)
+include_directories(SYSTEM ${JPEG_INCLUDE_DIR})
+
+include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
+
+set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
+
+# while the docs say JPEG_INCLUDE_DIRS, my FindJPEG.cmake script returns it in JPEG_INCLUDE_DIR
+set(CMAKE_REQUIRED_INCLUDES ${JPEG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
+
+add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
+
+if(UNIX OR MINGW)
+  include (${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
+endif()
+
+#set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+#set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION TRUE)
+#set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS TRUE)
+#set(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
+#set(CMAKE_INSTALL_OPENMP_LIBRARIES TRUE)
+
+#set(CompilerFlags
+#        CMAKE_CXX_FLAGS
+#        CMAKE_CXX_FLAGS_DEBUG
+#        CMAKE_CXX_FLAGS_RELEASE
+#        CMAKE_C_FLAGS
+#        CMAKE_C_FLAGS_DEBUG
+#        CMAKE_C_FLAGS_RELEASE
+#        )
+#foreach(CompilerFlag ${CompilerFlags})
+#  string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}")
+#endforeach()
+
+add_library(heifconvert STATIC ${heif_convert_sources})
+
+set_property(TARGET heifconvert PROPERTY
+  MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+
+target_link_directories (heifconvert PRIVATE ${additional_link_directories})
+target_link_libraries (heifconvert ${additional_libraries})
+target_include_directories(heifconvert PRIVATE ${additional_includes})
+
+message("Installing to: ${CMAKE_INSTALL_BINDIR}")
+install(TARGETS heifconvert RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+include(InstallRequiredSystemLibraries)

thirdparty/libheif/HeifConvertJNI/dist/ALL_BUILD.vcxproj.filters

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\CMakeLists.txt" />
+    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>

thirdparty/libheif/HeifConvertJNI/dist/CMakeCache.txt

@@ -1,5 +1,5 @@
 # This is the CMakeCache file.
-# For build in directory: c:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist
+# For build in directory: c:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist
 # It was generated by CMake: C:/Program Files/CMake/bin/cmake.exe
 # You can edit this file to change values found and used by cmake.
 # If you do not want to change any of the values, simply exit the editor.
@@ -23,37 +23,37 @@ CMAKE_AR:FILEPATH=C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Too
 CMAKE_CONFIGURATION_TYPES:STRING=Debug;Release;MinSizeRel;RelWithDebInfo
 
 //Flags used by the CXX compiler during all build types.
-CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3 /GR /EHsc
+CMAKE_CXX_FLAGS:STRING=/DWIN32 /D_WINDOWS /GR /EHsc
 
 //Flags used by the CXX compiler during DEBUG builds.
-CMAKE_CXX_FLAGS_DEBUG:STRING=/MDd /Zi /Ob0 /Od /RTC1
+CMAKE_CXX_FLAGS_DEBUG:STRING=/Zi /Ob0 /Od /RTC1
 
 //Flags used by the CXX compiler during MINSIZEREL builds.
-CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /DNDEBUG
+CMAKE_CXX_FLAGS_MINSIZEREL:STRING=/O1 /Ob1 /DNDEBUG
 
 //Flags used by the CXX compiler during RELEASE builds.
-CMAKE_CXX_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /DNDEBUG
+CMAKE_CXX_FLAGS_RELEASE:STRING=/O2 /Ob2 /DNDEBUG
 
 //Flags used by the CXX compiler during RELWITHDEBINFO builds.
-CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
+CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=/Zi /O2 /Ob1 /DNDEBUG
 
 //Libraries linked by default with all C++ applications.
 CMAKE_CXX_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
 
 //Flags used by the C compiler during all build types.
-CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS /W3
+CMAKE_C_FLAGS:STRING=/DWIN32 /D_WINDOWS
 
 //Flags used by the C compiler during DEBUG builds.
-CMAKE_C_FLAGS_DEBUG:STRING=/MDd /Zi /Ob0 /Od /RTC1
+CMAKE_C_FLAGS_DEBUG:STRING=/Zi /Ob0 /Od /RTC1
 
 //Flags used by the C compiler during MINSIZEREL builds.
-CMAKE_C_FLAGS_MINSIZEREL:STRING=/MD /O1 /Ob1 /DNDEBUG
+CMAKE_C_FLAGS_MINSIZEREL:STRING=/O1 /Ob1 /DNDEBUG
 
 //Flags used by the C compiler during RELEASE builds.
-CMAKE_C_FLAGS_RELEASE:STRING=/MD /O2 /Ob2 /DNDEBUG
+CMAKE_C_FLAGS_RELEASE:STRING=/O2 /Ob2 /DNDEBUG
 
 //Flags used by the C compiler during RELWITHDEBINFO builds.
-CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/MD /Zi /O2 /Ob1 /DNDEBUG
+CMAKE_C_FLAGS_RELWITHDEBINFO:STRING=/Zi /O2 /Ob1 /DNDEBUG
 
 //Libraries linked by default with all C applications.
 CMAKE_C_STANDARD_LIBRARIES:STRING=kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib
@@ -74,7 +74,7 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING=/INCREMENTAL:NO
 CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=/debug /INCREMENTAL
 
 //Install path prefix, prepended onto install directories.
-CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/heif-convert
+CMAKE_INSTALL_PREFIX:PATH=C:/Program Files/heifconvert
 
 //Path to a program.
 CMAKE_LINKER:FILEPATH=C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Tools/MSVC/14.31.31103/bin/Hostx64/x64/link.exe
@@ -109,7 +109,7 @@ CMAKE_PROJECT_DESCRIPTION:STATIC=
 CMAKE_PROJECT_HOMEPAGE_URL:STATIC=
 
 //Value Computed by CMake
-CMAKE_PROJECT_NAME:STATIC=heif-convert
+CMAKE_PROJECT_NAME:STATIC=heifconvert
 
 //RC compiler
 CMAKE_RC_COMPILER:FILEPATH=rc
@@ -201,13 +201,13 @@ JAVA_INCLUDE_PATH2:PATH=C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-
 JAVA_JVM_LIBRARY:FILEPATH=C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/lib/jvm.lib
 
 //Path to a file.
-JPEG_INCLUDE_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows/include
+JPEG_INCLUDE_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows-static/include
 
 //Path to a library.
-JPEG_LIBRARY_DEBUG:FILEPATH=C:/Users/gregd/vcpkg/installed/x64-windows/debug/lib/jpeg.lib
+JPEG_LIBRARY_DEBUG:FILEPATH=C:/Users/gregd/vcpkg/installed/x64-windows-static/debug/lib/jpeg.lib
 
 //Path to a library.
-JPEG_LIBRARY_RELEASE:FILEPATH=C:/Users/gregd/vcpkg/installed/x64-windows/lib/jpeg.lib
+JPEG_LIBRARY_RELEASE:FILEPATH=C:/Users/gregd/vcpkg/installed/x64-windows-static/lib/jpeg.lib
 
 //Path to a program.
 Java_IDLJ_EXECUTABLE:FILEPATH=C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/idlj.exe
@@ -230,6 +230,9 @@ Java_JAVAH_EXECUTABLE:FILEPATH=C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8
 //Path to a program.
 Java_JAVA_EXECUTABLE:FILEPATH=C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/java.exe
 
+//Path to a file.
+MSVC_REDIST_DIR:PATH=C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103
+
 //Automatically copy dependencies into the output directory for
 // executables.
 VCPKG_APPLOCAL_DEPS:BOOL=ON
@@ -249,8 +252,14 @@ VCPKG_MANIFEST_MODE:BOOL=OFF
 // found after toolchain/system libraries/packages.
 VCPKG_PREFER_SYSTEM_LIBS:BOOL=OFF
 
+//Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths
+VCPKG_SETUP_CMAKE_PROGRAM_PATH:BOOL=ON
+
 //Vcpkg target triplet (ex. x86-windows)
-VCPKG_TARGET_TRIPLET:STRING=x64-windows
+VCPKG_TARGET_TRIPLET:STRING=x64-windows-static
+
+//Setup CMAKE_PROGRAM_PATH to use host tools
+VCPKG_USE_HOST_TOOLS:BOOL=ON
 
 //Enables messages from the VCPKG toolchain for debugging purposes.
 VCPKG_VERBOSE:BOOL=OFF
@@ -263,30 +272,24 @@ X_VCPKG_APPLOCAL_DEPS_INSTALL:BOOL=OFF
 // serialization.
 X_VCPKG_APPLOCAL_DEPS_SERIALIZED:BOOL=OFF
 
-//Path to a program.
-Z_VCPKG_BUILTIN_POWERSHELL_PATH:FILEPATH=C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe
-
-//Path to a program.
-Z_VCPKG_PWSH_PATH:FILEPATH=Z_VCPKG_PWSH_PATH-NOTFOUND
-
 //The directory which contains the installed libraries for each
 // triplet
 _VCPKG_INSTALLED_DIR:PATH=C:/Users/gregd/vcpkg/installed
 
 //Value Computed by CMake
-heif-convert_BINARY_DIR:STATIC=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist
+heifconvert_BINARY_DIR:STATIC=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist
 
 //Value Computed by CMake
-heif-convert_IS_TOP_LEVEL:STATIC=ON
-
-//Dependencies for the target
-heif-convert_LIB_DEPENDS:STATIC=general;heif;optimized;C:/Users/gregd/vcpkg/installed/x64-windows/lib/jpeg.lib;debug;C:/Users/gregd/vcpkg/installed/x64-windows/debug/lib/jpeg.lib;
+heifconvert_IS_TOP_LEVEL:STATIC=ON
 
 //Value Computed by CMake
-heif-convert_SOURCE_DIR:STATIC=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI
+heifconvert_SOURCE_DIR:STATIC=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI
+
+//The directory containing a CMake configuration file for libde265.
+libde265_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libde265
 
 //The directory containing a CMake configuration file for libheif.
-libheif_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif
+libheif_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libheif
 
 
 ########################
@@ -296,7 +299,7 @@ libheif_DIR:PATH=C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif
 //ADVANCED property for variable: CMAKE_AR
 CMAKE_AR-ADVANCED:INTERNAL=1
 //This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist
+CMAKE_CACHEFILE_DIR:INTERNAL=c:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist
 //Major version of cmake used to create the current loaded cache
 CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
 //Minor version of cmake used to create the current loaded cache
@@ -357,7 +360,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=x64
 CMAKE_GENERATOR_TOOLSET:INTERNAL=
 //Source directory with the top level CMakeLists.txt file for this
 // project
-CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI
+CMAKE_HOME_DIRECTORY:INTERNAL=C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI
 //ADVANCED property for variable: CMAKE_LINKER
 CMAKE_LINKER-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS
@@ -424,11 +427,9 @@ CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
 //Details about finding JNI
 FIND_PACKAGE_MESSAGE_DETAILS_JNI:INTERNAL=[C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/lib/jawt.lib][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/lib/jvm.lib][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/include][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/include/win32][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/include][v()]
 //Details about finding JPEG
-FIND_PACKAGE_MESSAGE_DETAILS_JPEG:INTERNAL=[optimized;C:/Users/gregd/vcpkg/installed/x64-windows/lib/jpeg.lib;debug;C:/Users/gregd/vcpkg/installed/x64-windows/debug/lib/jpeg.lib][C:/Users/gregd/vcpkg/installed/x64-windows/include][v62()]
+FIND_PACKAGE_MESSAGE_DETAILS_JPEG:INTERNAL=[optimized;C:/Users/gregd/vcpkg/installed/x64-windows-static/lib/jpeg.lib;debug;C:/Users/gregd/vcpkg/installed/x64-windows-static/debug/lib/jpeg.lib][C:/Users/gregd/vcpkg/installed/x64-windows-static/include][v62()]
 //Details about finding Java
 FIND_PACKAGE_MESSAGE_DETAILS_Java:INTERNAL=[C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/java.exe][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/jar.exe][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/javac.exe][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/javah.exe][C:/Program Files/ojdkbuild/java-1.8.0-openjdk-1.8.0.222-1/bin/javadoc.exe][v1.8.0_222-1-ojdkbuild()]
-//Test HAVE_JPEG_WRITE_ICC_PROFILE
-HAVE_JPEG_WRITE_ICC_PROFILE:INTERNAL=1
 //ADVANCED property for variable: JAVA_AWT_INCLUDE_PATH
 JAVA_AWT_INCLUDE_PATH-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: JAVA_AWT_LIBRARY
@@ -459,6 +460,8 @@ Java_JAVADOC_EXECUTABLE-ADVANCED:INTERNAL=1
 Java_JAVAH_EXECUTABLE-ADVANCED:INTERNAL=1
 //ADVANCED property for variable: Java_JAVA_EXECUTABLE
 Java_JAVA_EXECUTABLE-ADVANCED:INTERNAL=1
+//ADVANCED property for variable: MSVC_REDIST_DIR
+MSVC_REDIST_DIR-ADVANCED:INTERNAL=1
 //Install the dependencies listed in your manifest:
 //\n    If this is off, you will have to manually install your dependencies.
 //\n    See https://github.com/microsoft/vcpkg/tree/master/docs/specifications/manifests.md
@@ -469,8 +472,6 @@ VCPKG_MANIFEST_INSTALL:INTERNAL=OFF
 VCPKG_VERBOSE-ADVANCED:INTERNAL=1
 //Making sure VCPKG_MANIFEST_MODE doesn't change
 Z_VCPKG_CHECK_MANIFEST_MODE:INTERNAL=OFF
-//The path to the PowerShell implementation to use.
-Z_VCPKG_POWERSHELL_PATH:INTERNAL=C:/Windows/System32/WindowsPowerShell/v1.0/powershell.exe
 //Vcpkg root directory
 Z_VCPKG_ROOT_DIR:INTERNAL=C:/Users/gregd/vcpkg
 

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/CompilerIdC.vcxproj

@@ -12,7 +12,7 @@
     <Keyword>Win32Proj</Keyword>
     
     
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
     
     
     

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/Debug/CompilerIdC.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe</FullPath>
+      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/Debug/CompilerIdC.tlog/CompilerIdC.lastbuildstate

@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.22000.0:VcpkgTriplet=x64-windows:
+Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\|

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/Debug/vcpkg.applocal.log

@@ -0,0 +1 @@
+

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/CompilerIdCXX.vcxproj

@@ -12,7 +12,7 @@
     <Keyword>Win32Proj</Keyword>
     
     
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
     
     
     

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/Debug/CompilerIdCXX.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe</FullPath>
+      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/Debug/CompilerIdCXX.tlog/CompilerIdCXX.lastbuildstate

@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.22000.0:VcpkgTriplet=x64-windows:
+Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\|

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/Debug/vcpkg.applocal.log

@@ -0,0 +1 @@
+

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/VCTargetsPath.vcxproj

@@ -10,7 +10,7 @@
 		<ProjectGuid>{F3FC6D86-508D-3FB1-96D2-995F08B142EC}</ProjectGuid>
 		<Keyword>Win32Proj</Keyword>
 		<Platform>x64</Platform>
-		<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+		<WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
 	<PropertyGroup>

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/x64/Debug/VCTargetsPath.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\x64\Debug\VCTargetsPath</FullPath>
+      <FullPath>C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\x64\Debug\VCTargetsPath</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/x64/Debug/VCTargetsPath.tlog/VCTargetsPath.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.19041.0:
-Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\|
+PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.22000.0:VcpkgTriplet=x64-windows:
+Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\|

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/CMakeOutput.log

@@ -0,0 +1,135 @@
+The system is: Windows - 10.0.19044 - AMD64
+Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
+Compiler:  
+Build flags: 
+Id flags:  
+
+The output was:
+0
+Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Build started 3/7/2022 7:18:41 PM.
+Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.vcxproj" on node 1 (default targets).
+PrepareForBuild:
+  Creating directory "Debug\".
+  Creating directory "Debug\CompilerIdC.tlog\".
+InitializeBuildStatus:
+  Creating "Debug\CompilerIdC.tlog\unsuccessfulbuild" because "AlwaysCreate" was specified.
+VcpkgTripletSelection:
+  Using triplet "x64-windows" from "C:\Users\gregd\vcpkg\installed\x64-windows\"
+ClCompile:
+  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\CL.exe /c /I"C:\Users\gregd\vcpkg\installed\x64-windows\include" /nologo /W0 /WX- /diagnostics:column /Od /D _MBCS /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"Debug\\" /Fd"Debug\vc143.pdb" /external:W0 /Gd /TC /FC /errorReport:queue CMakeCCompilerId.c
+  CMakeCCompilerId.c
+Link:
+  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\link.exe /ERRORREPORT:QUEUE /OUT:".\CompilerIdC.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:"C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib" /LIBPATH:"C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib\manual-link" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:".\CompilerIdC.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\CompilerIdC.lib" /MACHINE:X64 Debug\CMakeCCompilerId.obj
+  CompilerIdC.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe
+AppLocalFromInstalled:
+  pwsh.exe -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdC.tlog\CompilerIdC.write.1u.tlog" "Debug\vcpkg.applocal.log"
+  'pwsh.exe' is not recognized as an internal or external command,
+  operable program or batch file.
+  The command "pwsh.exe -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdC.tlog\CompilerIdC.write.1u.tlog" "Debug\vcpkg.applocal.log"" exited with code 9009.
+  "C:\WINDOWS\System32\WindowsPowerShell\v1.0\powershell.exe" -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdC.tlog\CompilerIdC.write.1u.tlog" "Debug\vcpkg.applocal.log"
+PostBuildEvent:
+  for %%i in (cl.exe) do @echo CMAKE_C_COMPILER=%%~$PATH:i
+  :VCEnd
+  CMAKE_C_COMPILER=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\Hostx64\x64\cl.exe
+FinalizeBuildStatus:
+  Deleting file "Debug\CompilerIdC.tlog\unsuccessfulbuild".
+  Touching "Debug\CompilerIdC.tlog\CompilerIdC.lastbuildstate".
+Done Building Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.vcxproj" (default targets).
+
+Build succeeded.
+    0 Warning(s)
+    0 Error(s)
+
+Time Elapsed 00:00:01.36
+
+
+Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CompilerIdC.exe"
+
+Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CompilerIdC.vcxproj"
+
+The C compiler identification is MSVC, found in "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/CompilerIdC.exe"
+
+Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
+Compiler:  
+Build flags: 
+Id flags:  
+
+The output was:
+0
+Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Build started 3/7/2022 7:18:43 PM.
+Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.vcxproj" on node 1 (default targets).
+PrepareForBuild:
+  Creating directory "Debug\".
+  Creating directory "Debug\CompilerIdCXX.tlog\".
+InitializeBuildStatus:
+  Creating "Debug\CompilerIdCXX.tlog\unsuccessfulbuild" because "AlwaysCreate" was specified.
+VcpkgTripletSelection:
+  Using triplet "x64-windows" from "C:\Users\gregd\vcpkg\installed\x64-windows\"
+ClCompile:
+  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\CL.exe /c /I"C:\Users\gregd\vcpkg\installed\x64-windows\include" /nologo /W0 /WX- /diagnostics:column /Od /D _MBCS /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"Debug\\" /Fd"Debug\vc143.pdb" /external:W0 /Gd /TP /FC /errorReport:queue CMakeCXXCompilerId.cpp
+  CMakeCXXCompilerId.cpp
+Link:
+  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\link.exe /ERRORREPORT:QUEUE /OUT:".\CompilerIdCXX.exe" /INCREMENTAL:NO /NOLOGO /LIBPATH:"C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib" /LIBPATH:"C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib\manual-link" kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "C:\Users\gregd\vcpkg\installed\x64-windows\debug\lib\*.lib" /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:".\CompilerIdCXX.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\CompilerIdCXX.lib" /MACHINE:X64 Debug\CMakeCXXCompilerId.obj
+  CompilerIdCXX.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe
+AppLocalFromInstalled:
+  pwsh.exe -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdCXX.tlog\CompilerIdCXX.write.1u.tlog" "Debug\vcpkg.applocal.log"
+  'pwsh.exe' is not recognized as an internal or external command,
+  operable program or batch file.
+  The command "pwsh.exe -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdCXX.tlog\CompilerIdCXX.write.1u.tlog" "Debug\vcpkg.applocal.log"" exited with code 9009.
+  "C:\WINDOWS\System32\WindowsPowerShell\v1.0\powershell.exe" -ExecutionPolicy Bypass -noprofile -File "C:\Users\gregd\vcpkg\scripts\buildsystems\msbuild\applocal.ps1" "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe" "C:\Users\gregd\vcpkg\installed\x64-windows\debug\bin" "Debug\CompilerIdCXX.tlog\CompilerIdCXX.write.1u.tlog" "Debug\vcpkg.applocal.log"
+PostBuildEvent:
+  for %%i in (cl.exe) do @echo CMAKE_CXX_COMPILER=%%~$PATH:i
+  :VCEnd
+  CMAKE_CXX_COMPILER=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\Hostx64\x64\cl.exe
+FinalizeBuildStatus:
+  Deleting file "Debug\CompilerIdCXX.tlog\unsuccessfulbuild".
+  Touching "Debug\CompilerIdCXX.tlog\CompilerIdCXX.lastbuildstate".
+Done Building Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.vcxproj" (default targets).
+
+Build succeeded.
+    0 Warning(s)
+    0 Error(s)
+
+Time Elapsed 00:00:01.31
+
+
+Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CompilerIdCXX.exe"
+
+Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CompilerIdCXX.vcxproj"
+
+The CXX compiler identification is MSVC, found in "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/CompilerIdCXX.exe"
+
+Detecting C compiler ABI info compiled with the following output:
+Change Dir: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/CMakeTmp
+
+Run Build Command(s):C:/Program Files/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/amd64/MSBuild.exe cmTC_e286b.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:VisualStudioVersion=17.0 /v:m && Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.31.31104 for x64
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  CMakeCCompilerABI.c
+  cl /c /Zi /W1 /WX- /diagnostics:column /Od /Ob0 /D _MBCS /D WIN32 /D _WINDOWS /D "CMAKE_INTDIR=\"Debug\"" /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"cmTC_e286b.dir\Debug\\" /Fd"cmTC_e286b.dir\Debug\vc143.pdb" /external:W1 /Gd /TC /errorReport:queue "C:\Program Files\CMake\share\cmake-3.23\Modules\CMakeCCompilerABI.c"
+  cmTC_e286b.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\CMakeTmp\Debug\cmTC_e286b.exe
+
+
+
+Detecting CXX compiler ABI info compiled with the following output:
+Change Dir: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/CMakeTmp
+
+Run Build Command(s):C:/Program Files/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/amd64/MSBuild.exe cmTC_68b59.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:VisualStudioVersion=17.0 /v:m && Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+  Microsoft (R) C/C++ Optimizing Compiler Version 19.31.31104 for x64
+  CMakeCXXCompilerABI.cpp
+  Copyright (C) Microsoft Corporation.  All rights reserved.
+  cl /c /Zi /W1 /WX- /diagnostics:column /Od /Ob0 /D _MBCS /D WIN32 /D _WINDOWS /D "CMAKE_INTDIR=\"Debug\"" /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /GR /Fo"cmTC_68b59.dir\Debug\\" /Fd"cmTC_68b59.dir\Debug\vc143.pdb" /external:W1 /Gd /TP /errorReport:queue "C:\Program Files\CMake\share\cmake-3.23\Modules\CMakeCXXCompilerABI.cpp"
+  cmTC_68b59.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\CMakeTmp\Debug\cmTC_68b59.exe
+
+
+

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/TargetDirectories.txt

@@ -1,4 +1,4 @@
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/heif-convert.dir
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/INSTALL.dir
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/ALL_BUILD.dir
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/ZERO_CHECK.dir
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/heifconvert.dir
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/INSTALL.dir
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/ALL_BUILD.dir
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/ZERO_CHECK.dir

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/generate.stamp.depend

@@ -93,6 +93,7 @@ C:/Program Files/CMake/share/cmake-3.23/Modules/FindJPEG.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/FindJava.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/FindPackageHandleStandardArgs.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/FindPackageMessage.cmake
+C:/Program Files/CMake/share/cmake-3.23/Modules/InstallRequiredSystemLibraries.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/Internal/CheckSourceCompiles.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/Internal/FeatureTesting.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/Platform/Windows-Determine-CXX.cmake
@@ -102,14 +103,18 @@ C:/Program Files/CMake/share/cmake-3.23/Modules/Platform/Windows-MSVC.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/Platform/Windows.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/Platform/WindowsPaths.cmake
 C:/Program Files/CMake/share/cmake-3.23/Modules/SelectLibraryConfigurations.cmake
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/CMakeLists.txt
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CMakeCCompiler.cmake
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CMakeCXXCompiler.cmake
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CMakeRCCompiler.cmake
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CMakeSystem.cmake
-C:/Users/gregd/vcpkg/installed/x64-windows/share/jpeg/vcpkg-cmake-wrapper.cmake
-C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif/libheif-config-debug.cmake
-C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif/libheif-config-release.cmake
-C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif/libheif-config-version.cmake
-C:/Users/gregd/vcpkg/installed/x64-windows/share/libheif/libheif-config.cmake
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/CMakeLists.txt
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CMakeCCompiler.cmake
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CMakeCXXCompiler.cmake
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CMakeRCCompiler.cmake
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/3.23.0-rc2/CMakeSystem.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/jpeg/vcpkg-cmake-wrapper.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libde265/libde265Config-debug.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libde265/libde265Config-release.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libde265/libde265Config.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libde265/libde265ConfigVersion.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libheif/libheif-config-debug.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libheif/libheif-config-release.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libheif/libheif-config-version.cmake
+C:/Users/gregd/vcpkg/installed/x64-windows-static/share/libheif/libheif-config.cmake
 C:/Users/gregd/vcpkg/scripts/buildsystems/vcpkg.cmake

thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/generate.stamp.list

@@ -1 +1 @@
-C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/generate.stamp
+C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/CMakeFiles/generate.stamp

thirdparty/libheif/HeifConvertJNI/dist/INSTALL.vcxproj

@@ -22,9 +22,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{8F47B954-D4F5-378C-AC37-5B042896AF82}</ProjectGuid>
+    <ProjectGuid>{84F917E4-0F70-399C-83E3-821C7301DBB4}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.22000.0</WindowsTargetPlatformVersion>
     <Platform>x64</Platform>
     <ProjectName>INSTALL</ProjectName>
     <VCProjectUpgraderObjectName>NoUpgrade</VCProjectUpgraderObjectName>
@@ -125,7 +125,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\2705a2fd9a29a14983f126804d7dabbc\INSTALL_force.rule">
+    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\06cc96876bbc4e5f0587617118ae5f60\INSTALL_force.rule">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> </Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
 cd .
@@ -137,7 +137,7 @@ exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\INSTALL_force</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\INSTALL_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
       <VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</VerifyInputsAndOutputsExist>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> </Message>
@@ -151,7 +151,7 @@ exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\INSTALL_force</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\INSTALL_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
       <VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</VerifyInputsAndOutputsExist>
       <Message Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'"> </Message>
@@ -165,7 +165,7 @@ exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\INSTALL_force</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\INSTALL_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</LinkObjects>
       <VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'">false</VerifyInputsAndOutputsExist>
       <Message Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'"> </Message>
@@ -179,20 +179,20 @@ exit /b %1
 :cmDone
 if %errorlevel% neq 0 goto :VCEnd</Command>
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">%(AdditionalInputs)</AdditionalInputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\INSTALL_force</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\INSTALL_force</Outputs>
       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</LinkObjects>
       <VerifyInputsAndOutputsExist Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'">false</VerifyInputsAndOutputsExist>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\ZERO_CHECK.vcxproj">
-      <Project>{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}</Project>
+    <ProjectReference Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\ZERO_CHECK.vcxproj">
+      <Project>{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}</Project>
       <Name>ZERO_CHECK</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </ProjectReference>
-    <ProjectReference Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\ALL_BUILD.vcxproj">
-      <Project>{59761B3A-CD52-3355-B8AA-355CC66FBE7A}</Project>
+    <ProjectReference Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\ALL_BUILD.vcxproj">
+      <Project>{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}</Project>
       <Name>ALL_BUILD</Name>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>

thirdparty/libheif/HeifConvertJNI/dist/INSTALL.vcxproj.filters

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\2705a2fd9a29a14983f126804d7dabbc\INSTALL_force.rule">
+    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\06cc96876bbc4e5f0587617118ae5f60\INSTALL_force.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{064F6CD9-3B6F-3D7F-9728-15D5F92EA2A8}</UniqueIdentifier>
+      <UniqueIdentifier>{F4F33F67-4689-3CA8-9E08-A8C78BF35C17}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>

thirdparty/libheif/HeifConvertJNI/dist/ZERO_CHECK.vcxproj.filters

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\2705a2fd9a29a14983f126804d7dabbc\generate.stamp.rule">
+    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\dist\CMakeFiles\06cc96876bbc4e5f0587617118ae5f60\generate.stamp.rule">
       <Filter>CMake Rules</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="CMake Rules">
-      <UniqueIdentifier>{064F6CD9-3B6F-3D7F-9728-15D5F92EA2A8}</UniqueIdentifier>
+      <UniqueIdentifier>{F4F33F67-4689-3CA8-9E08-A8C78BF35C17}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>

thirdparty/libheif/HeifConvertJNI/dist/cmake_install.cmake

@@ -0,0 +1,73 @@
+# Install script for directory: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI
+
+# Set the install prefix
+if(NOT DEFINED CMAKE_INSTALL_PREFIX)
+  set(CMAKE_INSTALL_PREFIX "C:/Program Files/heifconvert")
+endif()
+string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+# Set the install configuration name.
+if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
+  if(BUILD_TYPE)
+    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
+           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
+  else()
+    set(CMAKE_INSTALL_CONFIG_NAME "Release")
+  endif()
+  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
+endif()
+
+# Set the component getting installed.
+if(NOT CMAKE_INSTALL_COMPONENT)
+  if(COMPONENT)
+    message(STATUS "Install component: \"${COMPONENT}\"")
+    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
+  else()
+    set(CMAKE_INSTALL_COMPONENT)
+  endif()
+endif()
+
+# Is this installation the result of a crosscompile?
+if(NOT DEFINED CMAKE_CROSSCOMPILING)
+  set(CMAKE_CROSSCOMPILING "FALSE")
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
+  if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/Debug/heifconvert.lib")
+  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/Release/heifconvert.lib")
+  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Mm][Ii][Nn][Ss][Ii][Zz][Ee][Rr][Ee][Ll])$")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/MinSizeRel/heifconvert.lib")
+  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
+    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/RelWithDebInfo/heifconvert.lib")
+  endif()
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE PROGRAM FILES
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/msvcp140.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/msvcp140_1.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/msvcp140_2.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/msvcp140_atomic_wait.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/msvcp140_codecvt_ids.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/vcruntime140_1.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/vcruntime140.dll"
+    "C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Redist/MSVC/14.31.31103/x64/Microsoft.VC143.CRT/concrt140.dll"
+    )
+endif()
+
+if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
+  file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE DIRECTORY FILES "")
+endif()
+
+if(CMAKE_INSTALL_COMPONENT)
+  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
+else()
+  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
+endif()
+
+string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
+       "${CMAKE_INSTALL_MANIFEST_FILES}")
+file(WRITE "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertJNI/dist/${CMAKE_INSTALL_MANIFEST}"
+     "${CMAKE_INSTALL_MANIFEST_CONTENT}")

thirdparty/libheif/HeifConvertJNI/dist/heifconvert.sln

@@ -0,0 +1,67 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5} = {C00C365E-AFFA-31A4-9ED2-9394EC192DC5}
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0} = {055A5FCF-20E2-31E3-99F9-088EF91A8BE0}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", "INSTALL.vcxproj", "{84F917E4-0F70-399C-83E3-821C7301DBB4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD} = {9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5} = {C00C365E-AFFA-31A4-9ED2-9394EC192DC5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heifconvert", "heifconvert.vcxproj", "{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5} = {C00C365E-AFFA-31A4-9ED2-9394EC192DC5}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
+		MinSizeRel|x64 = MinSizeRel|x64
+		RelWithDebInfo|x64 = RelWithDebInfo|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.Debug|x64.ActiveCfg = Debug|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.Debug|x64.Build.0 = Debug|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.Release|x64.ActiveCfg = Release|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.Release|x64.Build.0 = Release|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{9F428133-6AEA-36CA-8E9C-5D7BC2DC18DD}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{84F917E4-0F70-399C-83E3-821C7301DBB4}.Debug|x64.ActiveCfg = Debug|x64
+		{84F917E4-0F70-399C-83E3-821C7301DBB4}.Release|x64.ActiveCfg = Release|x64
+		{84F917E4-0F70-399C-83E3-821C7301DBB4}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{84F917E4-0F70-399C-83E3-821C7301DBB4}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.Debug|x64.ActiveCfg = Debug|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.Debug|x64.Build.0 = Debug|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.Release|x64.ActiveCfg = Release|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.Release|x64.Build.0 = Release|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{C00C365E-AFFA-31A4-9ED2-9394EC192DC5}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.Debug|x64.ActiveCfg = Debug|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.Debug|x64.Build.0 = Debug|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.Release|x64.ActiveCfg = Release|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.Release|x64.Build.0 = Release|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
+		{055A5FCF-20E2-31E3-99F9-088EF91A8BE0}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {96720EA7-B8E1-3FF7-90F2-1D8CF4A3439D}
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

thirdparty/libheif/HeifConvertJNI/dist/heifconvert.vcxproj.filters

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="17.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\encoder.cc">
+    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\encoder.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.cc">
+    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\encoder_jpeg.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\encoder_jpeg.cc">
+    <ClCompile Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\encoder.h">
+    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\encoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.h">
+    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\encoder_jpeg.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\encoder_jpeg.h">
+    <ClInclude Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\CMakeLists.txt" />
+    <CustomBuild Include="C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertJNI\CMakeLists.txt" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{CBC44029-07BB-3213-8E38-17F72D951AFE}</UniqueIdentifier>
+      <UniqueIdentifier>{C25D2A56-7649-3614-9C04-3B8557383A7E}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{241D2CE4-9F84-3CBE-98DE-CFEE2E049D46}</UniqueIdentifier>
+      <UniqueIdentifier>{BBA1F7BB-4858-351A-9398-F975E73E5F83}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
 </Project>

thirdparty/libheif/HeifConvertJNI/org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.cc

@@ -426,4 +426,9 @@ extern "C" {
 	(JNIEnv* env, jclass cls, jbyteArray byteArr, jstring outputPath) {
 		return convertToDisk(env, cls, byteArr, outputPath);
 	}
+
+	jint JNIEXPORT JNI_OnLoad_heifconvert(JavaVM* vm, void*)
+	{
+		return JNI_VERSION_1_8;
+	}
 }

thirdparty/libheif/HeifConvertJNI/org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.h

@@ -15,6 +15,8 @@ extern "C" {
 JNIEXPORT int JNICALL Java_org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI_convertToDisk
   (JNIEnv *, jclass, jbyteArray, jstring);
 
+
+jint JNIEXPORT JNI_OnLoad_heifconvert(JavaVM*, void*);
 #ifdef __cplusplus
 }
 #endif

thirdparty/libheif/HeifConvertTestJNI/CMakeLists.txt

@@ -1,124 +0,0 @@
-cmake_minimum_required (VERSION 3.8)
-
-project ("heif-convert")
-
-find_package(libheif CONFIG REQUIRED)
-find_package(Java REQUIRED)
-
-message("JAVA_HOME = $ENV{JAVA_HOME}")
-message("Java_JAVA_EXECUTABLE = ${Java_JAVA_EXECUTABLE}")
-message("Java_JAVAC_EXECUTABLE = ${Java_JAVAC_EXECUTABLE}")
-message("Java_JAVAH_EXECUTABLE = ${Java_JAVAH_EXECUTABLE}")
-message("Java_JAVADOC_EXECUTABLE = ${Java_JAVADOC_EXECUTABLE}")
-message("Java_VERSION_STRING = ${Java_VERSION_STRING}")
-message("Java_VERSION = ${Java_VERSION}")
-
-find_package(JNI)
-find_package(JPEG REQUIRED)                                   
-
-if (JNI_FOUND)
-    message (STATUS "JNI_INCLUDE_DIRS=${JNI_INCLUDE_DIRS}")
-    message (STATUS "JNI_LIBRARIES=${JNI_LIBRARIES}")
-endif()
-
-add_compile_options(/std:c++latest)
-
-
-set (heif_convert_sources
-  encoder.cc
-  encoder.h
-  org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.cc
-  org_sleuthkit_autopsy_modules_pictureanalyzer_impls_HeifJNI.h
-)
-
-set (additional_link_directories)
-set (additional_libraries)
-set (additional_includes
-    ${JNI_INCLUDE_DIRS}
-)
-
-include (${CMAKE_ROOT}/Modules/FindJPEG.cmake)
-
-include_directories(SYSTEM ${JPEG_INCLUDE_DIR})
-
-include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
-
-set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES})
-
-# while the docs say JPEG_INCLUDE_DIRS, my FindJPEG.cmake script returns it in JPEG_INCLUDE_DIR
-set(CMAKE_REQUIRED_INCLUDES ${JPEG_INCLUDE_DIRS} ${JPEG_INCLUDE_DIR})
-
-check_cxx_source_compiles("
-#include <stddef.h>
-#include <stdio.h>
-#include <jpeglib.h>
-
-int main() {
-  jpeg_write_icc_profile(NULL, NULL, 0);
-  return 0;
-}
-" HAVE_JPEG_WRITE_ICC_PROFILE)
-if(HAVE_JPEG_WRITE_ICC_PROFILE)
-  add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1)
-endif()
-
-set (heif_convert_sources
-  ${heif_convert_sources}
-  encoder_jpeg.cc
-  encoder_jpeg.h
-)
-set (additional_libraries
-  ${additional_libraries}
-  ${JPEG_LIBRARIES}
-)
-set (additional_includes
-  ${additional_includes}
-  ${JPEG_INCLUDE_DIRS}
-  ${JPEG_INCLUDE_DIR}
-)
-
-if(UNIX OR MINGW)
-  include (${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
-  pkg_check_modules (LIBPNG libpng)
-  if(LIBPNG_FOUND)
-    add_definitions(-DHAVE_LIBPNG=1)
-    set (heif_convert_sources
-      ${heif_convert_sources}
-      encoder_png.cc
-      encoder_png.h
-    )
-    set (additional_link_directories
-      ${additional_link_directories}
-      ${LIBPNG_LIBRARY_DIRS}
-    )
-    set (additional_libraries
-      ${additional_libraries}
-      ${LIBPNG_LINK_LIBRARIES} ${LIBPNG_LIBRARIES}
-    )
-    set (additional_includes
-      ${additional_includes}
-      ${LIBPNG_INCLUDE_DIRS}
-    )
-  endif()
-endif()
-
-set (heif_info_sources
-  heif_info.cc
-)
-
-set (heif_enc_sources
-  heif_enc.cc
-)
-
-set (heif_test_sources
-  heif_test.cc
-)
-
-
-add_library(heif-convert SHARED ${heif_convert_sources})
-
-target_link_directories (heif-convert PRIVATE ${additional_link_directories})
-target_link_libraries (heif-convert PRIVATE heif ${additional_libraries})
-target_include_directories(heif-convert PRIVATE ${additional_includes})
-install(TARGETS heif-convert RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES heif-convert.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/Debug/CompilerIdC.tlog/CompilerIdC.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.19041.0:
-Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\|

thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/Debug/CompilerIdCXX.tlog/CompilerIdCXX.lastbuildstate

@@ -1,2 +0,0 @@
-PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.19041.0:
-Debug|x64|C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\|

thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/CMakeOutput.log

@@ -1,143 +0,0 @@
-The system is: Windows - 10.0.19044 - AMD64
-Compiling the C compiler identification source file "CMakeCCompilerId.c" succeeded.
-Compiler:  
-Build flags: 
-Id flags:  
-
-The output was:
-0
-Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
-Copyright (C) Microsoft Corporation. All rights reserved.
-
-Build started 3/2/2022 9:23:10 AM.
-Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.vcxproj" on node 1 (default targets).
-PrepareForBuild:
-  Creating directory "Debug\".
-  Creating directory "Debug\CompilerIdC.tlog\".
-InitializeBuildStatus:
-  Creating "Debug\CompilerIdC.tlog\unsuccessfulbuild" because "AlwaysCreate" was specified.
-ClCompile:
-  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\CL.exe /c /nologo /W0 /WX- /diagnostics:column /Od /D _MBCS /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"Debug\\" /Fd"Debug\vc143.pdb" /external:W0 /Gd /TC /FC /errorReport:queue CMakeCCompilerId.c
-  CMakeCCompilerId.c
-Link:
-  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\link.exe /ERRORREPORT:QUEUE /OUT:".\CompilerIdC.exe" /INCREMENTAL:NO /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:".\CompilerIdC.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\CompilerIdC.lib" /MACHINE:X64 Debug\CMakeCCompilerId.obj
-  CompilerIdC.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.exe
-PostBuildEvent:
-  for %%i in (cl.exe) do @echo CMAKE_C_COMPILER=%%~$PATH:i
-  :VCEnd
-  CMAKE_C_COMPILER=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\Hostx64\x64\cl.exe
-FinalizeBuildStatus:
-  Deleting file "Debug\CompilerIdC.tlog\unsuccessfulbuild".
-  Touching "Debug\CompilerIdC.tlog\CompilerIdC.lastbuildstate".
-Done Building Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdC\CompilerIdC.vcxproj" (default targets).
-
-Build succeeded.
-    0 Warning(s)
-    0 Error(s)
-
-Time Elapsed 00:00:00.61
-
-
-Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CompilerIdC.exe"
-
-Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "CompilerIdC.vcxproj"
-
-The C compiler identification is MSVC, found in "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdC/CompilerIdC.exe"
-
-Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded.
-Compiler:  
-Build flags: 
-Id flags:  
-
-The output was:
-0
-Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
-Copyright (C) Microsoft Corporation. All rights reserved.
-
-Build started 3/2/2022 9:23:11 AM.
-Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.vcxproj" on node 1 (default targets).
-PrepareForBuild:
-  Creating directory "Debug\".
-  Creating directory "Debug\CompilerIdCXX.tlog\".
-InitializeBuildStatus:
-  Creating "Debug\CompilerIdCXX.tlog\unsuccessfulbuild" because "AlwaysCreate" was specified.
-ClCompile:
-  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\CL.exe /c /nologo /W0 /WX- /diagnostics:column /Od /D _MBCS /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"Debug\\" /Fd"Debug\vc143.pdb" /external:W0 /Gd /TP /FC /errorReport:queue CMakeCXXCompilerId.cpp
-  CMakeCXXCompilerId.cpp
-Link:
-  C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\HostX64\x64\link.exe /ERRORREPORT:QUEUE /OUT:".\CompilerIdCXX.exe" /INCREMENTAL:NO /NOLOGO kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /PDB:".\CompilerIdCXX.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:".\CompilerIdCXX.lib" /MACHINE:X64 Debug\CMakeCXXCompilerId.obj
-  CompilerIdCXX.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.exe
-PostBuildEvent:
-  for %%i in (cl.exe) do @echo CMAKE_CXX_COMPILER=%%~$PATH:i
-  :VCEnd
-  CMAKE_CXX_COMPILER=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.31.31103\bin\Hostx64\x64\cl.exe
-FinalizeBuildStatus:
-  Deleting file "Debug\CompilerIdCXX.tlog\unsuccessfulbuild".
-  Touching "Debug\CompilerIdCXX.tlog\CompilerIdCXX.lastbuildstate".
-Done Building Project "C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\3.23.0-rc2\CompilerIdCXX\CompilerIdCXX.vcxproj" (default targets).
-
-Build succeeded.
-    0 Warning(s)
-    0 Error(s)
-
-Time Elapsed 00:00:00.49
-
-
-Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CompilerIdCXX.exe"
-
-Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "CompilerIdCXX.vcxproj"
-
-The CXX compiler identification is MSVC, found in "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/3.23.0-rc2/CompilerIdCXX/CompilerIdCXX.exe"
-
-Detecting C compiler ABI info compiled with the following output:
-Change Dir: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/CMakeTmp
-
-Run Build Command(s):C:/Program Files/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/amd64/MSBuild.exe cmTC_ce9c3.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:VisualStudioVersion=17.0 /v:m && Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
-Copyright (C) Microsoft Corporation. All rights reserved.
-
-  Microsoft (R) C/C++ Optimizing Compiler Version 19.31.31104 for x64
-  Copyright (C) Microsoft Corporation.  All rights reserved.
-  CMakeCCompilerABI.c
-  cl /c /Zi /W3 /WX- /diagnostics:column /Od /Ob0 /D _MBCS /D WIN32 /D _WINDOWS /D "CMAKE_INTDIR=\"Debug\"" /Gm- /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /Fo"cmTC_ce9c3.dir\Debug\\" /Fd"cmTC_ce9c3.dir\Debug\vc143.pdb" /external:W3 /Gd /TC /errorReport:queue "C:\Program Files\CMake\share\cmake-3.23\Modules\CMakeCCompilerABI.c"
-  cmTC_ce9c3.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\CMakeTmp\Debug\cmTC_ce9c3.exe
-
-
-
-Detecting CXX compiler ABI info compiled with the following output:
-Change Dir: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/CMakeTmp
-
-Run Build Command(s):C:/Program Files/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/amd64/MSBuild.exe cmTC_5a6c4.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:VisualStudioVersion=17.0 /v:m && Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
-Copyright (C) Microsoft Corporation. All rights reserved.
-
-  Microsoft (R) C/C++ Optimizing Compiler Version 19.31.31104 for x64
-  Copyright (C) Microsoft Corporation.  All rights reserved.
-  CMakeCXXCompilerABI.cpp
-  cl /c /Zi /W3 /WX- /diagnostics:column /Od /Ob0 /D _MBCS /D WIN32 /D _WINDOWS /D "CMAKE_INTDIR=\"Debug\"" /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /GR /Fo"cmTC_5a6c4.dir\Debug\\" /Fd"cmTC_5a6c4.dir\Debug\vc143.pdb" /external:W3 /Gd /TP /errorReport:queue "C:\Program Files\CMake\share\cmake-3.23\Modules\CMakeCXXCompilerABI.cpp"
-  cmTC_5a6c4.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\CMakeTmp\Debug\cmTC_5a6c4.exe
-
-
-
-Performing C++ SOURCE FILE Test HAVE_JPEG_WRITE_ICC_PROFILE succeeded with the following output:
-Change Dir: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/CMakeFiles/CMakeTmp
-
-Run Build Command(s):C:/Program Files/Microsoft Visual Studio/2022/Community/MSBuild/Current/Bin/amd64/MSBuild.exe cmTC_bc762.vcxproj /p:Configuration=Debug /p:Platform=x64 /p:VisualStudioVersion=17.0 /v:m && Microsoft (R) Build Engine version 17.1.0+ae57d105c for .NET Framework
-Copyright (C) Microsoft Corporation. All rights reserved.
-
-  Microsoft (R) C/C++ Optimizing Compiler Version 19.31.31104 for x64
-  src.cxx
-  Copyright (C) Microsoft Corporation.  All rights reserved.
-  cl /c /I"C:\Users\gregd\vcpkg\installed\x64-windows\include" /Zi /W3 /WX- /diagnostics:column /Od /Ob0 /D _MBCS /D WIN32 /D _WINDOWS /D HAVE_JPEG_WRITE_ICC_PROFILE /D "CMAKE_INTDIR=\"Debug\"" /Gm- /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Zc:inline /GR /Fo"cmTC_bc762.dir\Debug\\" /Fd"cmTC_bc762.dir\Debug\vc143.pdb" /external:W3 /Gd /TP /errorReport:queue C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\CMakeTmp\src.cxx
-  cmTC_bc762.vcxproj -> C:\Users\gregd\Documents\Source\autopsy\thirdparty\libheif\HeifConvertTestJNI\dist\CMakeFiles\CMakeTmp\Debug\cmTC_bc762.exe
-
-
-Source file was:
-
-#include <stddef.h>
-#include <stdio.h>
-#include <jpeglib.h>
-
-int main() {
-  jpeg_write_icc_profile(NULL, NULL, 0);
-  return 0;
-}
-

thirdparty/libheif/HeifConvertTestJNI/dist/cmake_install.cmake

@@ -1,80 +0,0 @@
-# Install script for directory: C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI
-
-# Set the install prefix
-if(NOT DEFINED CMAKE_INSTALL_PREFIX)
-  set(CMAKE_INSTALL_PREFIX "C:/Program Files/heif-convert")
-endif()
-string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-# Set the install configuration name.
-if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME)
-  if(BUILD_TYPE)
-    string(REGEX REPLACE "^[^A-Za-z0-9_]+" ""
-           CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}")
-  else()
-    set(CMAKE_INSTALL_CONFIG_NAME "Release")
-  endif()
-  message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"")
-endif()
-
-# Set the component getting installed.
-if(NOT CMAKE_INSTALL_COMPONENT)
-  if(COMPONENT)
-    message(STATUS "Install component: \"${COMPONENT}\"")
-    set(CMAKE_INSTALL_COMPONENT "${COMPONENT}")
-  else()
-    set(CMAKE_INSTALL_COMPONENT)
-  endif()
-endif()
-
-# Is this installation the result of a crosscompile?
-if(NOT DEFINED CMAKE_CROSSCOMPILING)
-  set(CMAKE_CROSSCOMPILING "FALSE")
-endif()
-
-if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
-  if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY OPTIONAL FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/Debug/heif-convert.lib")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY OPTIONAL FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/Release/heif-convert.lib")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Mm][Ii][Nn][Ss][Ii][Zz][Ee][Rr][Ee][Ll])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY OPTIONAL FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/MinSizeRel/heif-convert.lib")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY OPTIONAL FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/RelWithDebInfo/heif-convert.lib")
-  endif()
-endif()
-
-if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
-  if("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Dd][Ee][Bb][Uu][Gg])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/Debug/heif-convert.dll")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ee][Aa][Ss][Ee])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/Release/heif-convert.dll")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Mm][Ii][Nn][Ss][Ii][Zz][Ee][Rr][Ee][Ll])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/MinSizeRel/heif-convert.dll")
-  elseif("${CMAKE_INSTALL_CONFIG_NAME}" MATCHES "^([Rr][Ee][Ll][Ww][Ii][Tt][Hh][Dd][Ee][Bb][Ii][Nn][Ff][Oo])$")
-    file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE SHARED_LIBRARY FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/RelWithDebInfo/heif-convert.dll")
-  endif()
-endif()
-
-if("x${CMAKE_INSTALL_COMPONENT}x" STREQUAL "xUnspecifiedx" OR NOT CMAKE_INSTALL_COMPONENT)
-  list(APPEND CMAKE_ABSOLUTE_DESTINATION_FILES
-   "/man1/heif-convert.1")
-  if(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION)
-    message(WARNING "ABSOLUTE path INSTALL DESTINATION : ${CMAKE_ABSOLUTE_DESTINATION_FILES}")
-  endif()
-  if(CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION)
-    message(FATAL_ERROR "ABSOLUTE path INSTALL DESTINATION forbidden (by caller): ${CMAKE_ABSOLUTE_DESTINATION_FILES}")
-  endif()
-  file(INSTALL DESTINATION "/man1" TYPE FILE FILES "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/heif-convert.1")
-endif()
-
-if(CMAKE_INSTALL_COMPONENT)
-  set(CMAKE_INSTALL_MANIFEST "install_manifest_${CMAKE_INSTALL_COMPONENT}.txt")
-else()
-  set(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
-endif()
-
-string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT
-       "${CMAKE_INSTALL_MANIFEST_FILES}")
-file(WRITE "C:/Users/gregd/Documents/Source/autopsy/thirdparty/libheif/HeifConvertTestJNI/dist/${CMAKE_INSTALL_MANIFEST}"
-     "${CMAKE_INSTALL_MANIFEST_CONTENT}")

thirdparty/libheif/HeifConvertTestJNI/dist/heif-convert.sln

@@ -1,67 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL_BUILD", "ALL_BUILD.vcxproj", "{59761B3A-CD52-3355-B8AA-355CC66FBE7A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE} = {CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD} = {19A74D12-2F46-3B8A-831C-73CDB2569BFD}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "INSTALL", "INSTALL.vcxproj", "{8F47B954-D4F5-378C-AC37-5B042896AF82}"
-	ProjectSection(ProjectDependencies) = postProject
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A} = {59761B3A-CD52-3355-B8AA-355CC66FBE7A}
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE} = {CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "ZERO_CHECK.vcxproj", "{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heif-convert", "heif-convert.vcxproj", "{19A74D12-2F46-3B8A-831C-73CDB2569BFD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE} = {CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-		MinSizeRel|x64 = MinSizeRel|x64
-		RelWithDebInfo|x64 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.Debug|x64.ActiveCfg = Debug|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.Debug|x64.Build.0 = Debug|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.Release|x64.ActiveCfg = Release|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.Release|x64.Build.0 = Release|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{59761B3A-CD52-3355-B8AA-355CC66FBE7A}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{8F47B954-D4F5-378C-AC37-5B042896AF82}.Debug|x64.ActiveCfg = Debug|x64
-		{8F47B954-D4F5-378C-AC37-5B042896AF82}.Release|x64.ActiveCfg = Release|x64
-		{8F47B954-D4F5-378C-AC37-5B042896AF82}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{8F47B954-D4F5-378C-AC37-5B042896AF82}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.Debug|x64.ActiveCfg = Debug|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.Debug|x64.Build.0 = Debug|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.Release|x64.ActiveCfg = Release|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.Release|x64.Build.0 = Release|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{CDA8F48B-69FE-3A49-8E17-9D2CDA18E3BE}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.Debug|x64.ActiveCfg = Debug|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.Debug|x64.Build.0 = Debug|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.Release|x64.ActiveCfg = Release|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.Release|x64.Build.0 = Release|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
-		{19A74D12-2F46-3B8A-831C-73CDB2569BFD}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {74691509-05B8-3D1D-8A4C-848028845F16}
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

thirdparty/libheif/README.txt

@@ -2,17 +2,15 @@ This project relies heavily on libheif: https://github.com/strukturag/libheif/ a
 
 In order to build this, the project requires vcpkg (directions here: https://vcpkg.io/en/getting-started.html), cmake (https://cmake.org/download/), and visual studio build tools for cmake (I downloaded visual studio 17 2022).  This project will require the following vcpkg dependencies:
 
-libde265:x64-windows
-libheif:x64-windows (files in project were grabbed from the libheif examples folder as of v1.12.0)
-libjpeg-turbo:x64-windows
-x265:x64-windows
-vcpkg-cmake-config:x64-windows
-vcpkg-cmake:x64-windows
+libde265:x64-windows-static
+libheif:x64-windows-static (files in project were grabbed from the libheif examples folder as of v1.12.0)
+libjpeg-turbo:x64-windows-static
+x265:x64-windows-static
 
-or something other than the suffix :x64-windows for different architectures.
+or something other than the suffix :x64-windows for different architectures.  The -static suffix is specified so that the vcruntime does not to be dynamically linked (and therefore a dependency)
 
 In order to build, 
-1) from command line, set directory to HeifConvertTestJNI\dist
+1) from command line, set directory to HeifConvertJNI\dist
 2) You can rebuild the vcxproj in this directory by running:  cmake -G "Visual Studio 17 2022" -A x64 -S .. "-DCMAKE_TOOLCHAIN_FILE=PATH_TO_VCPKG_INSTALL/scripts/buildsystems/vcpkg.cmake"
 3) The binaries can be created by running: cmake --build . --config Release