Merge pull request #14 from vircon32/RemoveSDLImage

Remove SDL_image dependency

Author: vircon32

DesktopEmulator/CMakeLists.txt

@@ -28,7 +28,7 @@ project("Vircon32" LANGUAGES C CXX)
 # Define version
 set(PROJECT_VERSION_MAJOR 25)
 set(PROJECT_VERSION_MINOR 2)
-set(PROJECT_VERSION_PATCH 2)
+set(PROJECT_VERSION_PATCH 3)
 
 # Set names for final executables
 set(EMULATOR_BINARY_NAME "Vircon32")
@@ -140,7 +140,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeMod
 # For these depencencies, find everything they need too
 find_package(OpenGL REQUIRED)
 find_package(SDL2 REQUIRED)
-find_package(SDL2_image REQUIRED)
 find_package(OpenAL REQUIRED)
 
 # On Linux we will need to find GTK too
@@ -185,7 +184,6 @@ endfunction()
 message(STATUS "System Dependencies:")
 show_dependency_status("OPENGL" OPENGL)
 show_dependency_status("SDL2" SDL2)
-show_dependency_status("SDL2_image" SDL2_image)
 show_dependency_status("OPENAL" OPENAL)
 show_dependency_status("PNG" PNG)
 show_dependency_status("FREEALUT" FREEALUT)
@@ -229,10 +227,8 @@ set(EMULATOR_LIBS
     imgui
     V32ConsoleLogic
     tinyxml2
-    ${PNG_LIBRARY}
     ${OPENGL_LIBRARIES}
     ${SDL2_LIBRARY}
-    ${SDL2_IMAGE_LIBRARY}
     ${PNG_LIBRARY}
     glad
     ${OPENAL_LIBRARY}
@@ -246,8 +242,6 @@ set(EDITCONTROLS_LIBS
     tinyxml2
     ${OPENGL_LIBRARIES}
     ${SDL2_LIBRARY}
-    ${SDL2_IMAGE_LIBRARY}
-    ${PNG_LIBRARY}
     glad
     ${CMAKE_DL_LIBS})
 

DesktopEmulator/ControlsEditor/LoadTexture.cpp

@@ -9,7 +9,6 @@
     // include SDL2 headers
     #define SDL_MAIN_HANDLED
     #include "SDL.h"            // [ SDL2 ] Main header
-    #include "SDL_image.h"      // [ SDL2 ] SDL_Image
 
     // declare used namespaces
     using namespace std;
@@ -31,16 +30,12 @@ GLuint LoadTexture( const string& FileName )
     SDL_Surface* LoadedImage = NULL;
 
     // load image from file
-    LoadedImage = IMG_Load( FileName.c_str() );
+    LoadedImage = SDL_LoadBMP( FileName.c_str() );
 
     // check errors
     if( !LoadedImage )
       THROW( "Could not load image into an SDL surface" );
 
-    // only 32bpp images are supported
-    if( LoadedImage->format->BitsPerPixel < 24 )
-      THROW( "Only true color images are supported (24 or 32 bits per pixel)" );
-    
     // read image dimensions
     int ImageWidth  = LoadedImage->w;
     int ImageHeight = LoadedImage->h;
@@ -49,6 +44,16 @@ GLuint LoadTexture( const string& FileName )
     int TextureWidth  = NextPowerOf2( ImageWidth  );
     int TextureHeight = NextPowerOf2( ImageHeight );
 
+    // convert surface to 32-bit RGBA
+    SDL_Surface* Aux = LoadedImage;
+    SDL_Surface* ConvertedImage = SDL_ConvertSurfaceFormat( LoadedImage, SDL_PIXELFORMAT_RGBA32, 0 );
+    
+    if( !ConvertedImage )
+      THROW( "SDL failed to convert texture to RGBA" );
+    
+    LoadedImage = ConvertedImage;
+    SDL_FreeSurface( Aux );
+    
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     // STEP 2: CREATE OPENGL TEXTURE FROM LOADED IMAGE
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -65,9 +70,6 @@ GLuint LoadTexture( const string& FileName )
     // clear OpenGL errors
     glGetError();
 
-    // format configuration to build the OpenGL texture from the SDL surface
-    GLenum ImageType = (LoadedImage->format->BytesPerPixel == 4)? GL_RGBA : GL_RGB;
-    
     // (1) first we build an empty texture of the extented size
     glTexImage2D
     (
@@ -77,7 +79,7 @@ GLuint LoadTexture( const string& FileName )
         TextureWidth,           // texture width in pixels
         TextureHeight,          // texture height in pixels
         0,                      // border width (must be 0 or 1)
-        ImageType,              // color components in the source
+        GL_RGBA,                // color components in the source
         GL_UNSIGNED_BYTE,       // each color component is a byte
         nullptr                 // buffer storing the texture data
     );
@@ -95,7 +97,7 @@ GLuint LoadTexture( const string& FileName )
         0,                      // y offset
         ImageWidth,             // image width in pixels
         ImageHeight,            // image height in pixels
-        ImageType,              // color components in the source
+        GL_RGBA,                // color components in the source
         GL_UNSIGNED_BYTE,       // each color component is a byte
         LoadedImage->pixels     // buffer storing the texture data
     );

DesktopEmulator/ControlsEditor/Main.cpp

@@ -23,7 +23,6 @@
     #include "SDL.h"            // [ SDL2 ] Main header
     #include "SDL_opengl.h"     // [ SDL2 ] OpenGL interface
     #include "SDL_joystick.h"   // [ SDL2 ] Joystick functions
-    #include "SDL_image.h"      // [ SDL2 ] SDL_Image
 
     // detection of Windows
     #if defined(__WIN32__) || defined(_WIN32) || defined(_WIN64)
@@ -358,7 +357,7 @@ int main()
         Languages[ "Spanish" ] = LanguageSpanish;
 
         // load our gamepad texture
-        GamepadTextureID = LoadTexture( ProgramFolder + "Images" + PathSeparator + "GamepadMapping.png" );
+        GamepadTextureID = LoadTexture( ProgramFolder + "Images" + PathSeparator + "GamepadMapping.bmp" );
 
         // load our configuration from XML file
         LoadControls( ProgramFolder + "Config-Controls.xml" );
@@ -373,8 +372,8 @@ int main()
         #if !defined(WINDOWS_OS)            
           try
           {
-              string IconPath = string(ProgramFolder) + "Images" + PathSeparator + "EditControlsMultisize.ico";
-              SDL_Surface* WindowIcon = IMG_Load( IconPath.c_str() );
+              string IconPath = string(ProgramFolder) + "Images" + PathSeparator + "EditControlsWindowIcon.bmp";
+              SDL_Surface* WindowIcon = SDL_LoadBMP( IconPath.c_str() );
               SDL_SetWindowIcon( OpenGL2D.Window, WindowIcon );
               LOG( "Loaded program icon" );
           }

DesktopEmulator/Data/Images/EditControlsWindowIcon.bmp

@@ -24,7 +24,7 @@
 
     // include SDL2 headers
     #define SDL_MAIN_HANDLED
-    #include "SDL_image.h"      // [ SDL2 ] SDL_Image
+    #include "SDL.h"            // [ SDL2 ] Main header
 
     // include imgui headers
     #include <imgui/imgui.h>                // [ Dear ImGui ] Main header
@@ -254,14 +254,14 @@ int main( int NumberOfArguments, char* Arguments[] )
             // on non-windows systems load and set the window icon
             // (not needed on Windows: already packed in the executable)
             #if !defined(WINDOWS_OS)            
-              string IconPath = string(EmulatorFolder) + "Images" + PathSeparator + "Vircon32Multisize.ico";
-              SDL_Surface* WindowIcon = IMG_Load( IconPath.c_str() );
+              string IconPath = string(EmulatorFolder) + "Images" + PathSeparator + "Vircon32WindowIcon.bmp";
+              SDL_Surface* WindowIcon = SDL_LoadBMP( IconPath.c_str() );
               SDL_SetWindowIcon( Video.GetWindow(), WindowIcon );
               LOG( "Loaded program icon" );
             #endif
 
             // load the no signal image
-            NoSignalTexture.Load( string(EmulatorFolder) + "Images" + PathSeparator + "NoSignal.png" );
+            NoSignalTexture.Load( string(EmulatorFolder) + "Images" + PathSeparator + "NoSignal.bmp" );
         }
         catch( exception& e )
         {

DesktopEmulator/Data/Images/GamepadMapping.bmp

@@ -11,7 +11,6 @@
     // include SDL2 headers
     #define SDL_MAIN_HANDLED
     #include "SDL.h"            // [ SDL2 ] Main header
-    #include "SDL_image.h"      // [ SDL2 ] SDL_Image
 
     // declare used namespaces
     using namespace std;
@@ -62,16 +61,12 @@ void Texture::Load( const string& FileName )
     SDL_Surface* LoadedImage = NULL;
 
     // load image from file
-    LoadedImage = IMG_Load( FileName.c_str() );
+    LoadedImage = SDL_LoadBMP( FileName.c_str() );
 
     // check errors
     if( !LoadedImage )
       THROW( "Could not load image into an SDL surface" );
 
-    // only 32bpp images are supported
-    if( LoadedImage->format->BitsPerPixel < 24 )
-      THROW( "Only true color images are supported (24 or 32 bits per pixel)" );
-    
     // read image dimensions
     ImageWidth  = LoadedImage->w;
     ImageHeight = LoadedImage->h;
@@ -80,6 +75,16 @@ void Texture::Load( const string& FileName )
     TextureWidth  = NextPowerOf2( ImageWidth  );
     TextureHeight = NextPowerOf2( ImageHeight );
 
+    // convert surface to 32-bit RGBA
+    SDL_Surface* Aux = LoadedImage;
+    SDL_Surface* ConvertedImage = SDL_ConvertSurfaceFormat( LoadedImage, SDL_PIXELFORMAT_RGBA32, 0 );
+    
+    if( !ConvertedImage )
+      THROW( "SDL failed to convert texture to RGBA" );
+    
+    LoadedImage = ConvertedImage;
+    SDL_FreeSurface( Aux );
+    
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     // STEP 2: CREATE OPENGL TEXTURE FROM LOADED IMAGE
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -95,9 +100,6 @@ void Texture::Load( const string& FileName )
     // clear OpenGL errors
     glGetError();
 
-    // format configuration to build the OpenGL texture from the SDL surface
-    GLenum ImageType = (LoadedImage->format->BytesPerPixel == 4)? GL_RGBA : GL_RGB;
-    
     // (1) first we build an empty texture of the extented size
     glTexImage2D
     (
@@ -107,7 +109,7 @@ void Texture::Load( const string& FileName )
         TextureWidth,           // texture width in pixels
         TextureHeight,          // texture height in pixels
         0,                      // border width (must be 0 or 1)
-        ImageType,              // color components in the source
+        GL_RGBA,                // color components in the source
         GL_UNSIGNED_BYTE,       // each color component is a byte
         nullptr                 // buffer storing the texture data
     );
@@ -125,7 +127,7 @@ void Texture::Load( const string& FileName )
         0,                      // y offset
         ImageWidth,             // image width in pixels
         ImageHeight,            // image height in pixels
-        ImageType,              // color components in the source
+        GL_RGBA,                // color components in the source
         GL_UNSIGNED_BYTE,       // each color component is a byte
         LoadedImage->pixels     // buffer storing the texture data
     );

DesktopEmulator/Data/Images/GamepadMapping.png

@@ -29,8 +29,6 @@ else()
         osdialog/osdialog_${OSDIALOG_TARGET}.c)
 endif()
 
-# source files to compile XML library tinyxml2
-# (ignore the original CMake script)
-add_library(tinyxml2 STATIC
-    tinyxml2/tinyxml2.cpp)
-
+# XML library tinyxml2
+# (use the modified CMake script in its folder)
+add_subdirectory(tinyxml2)

DesktopEmulator/Data/Images/NoSignal.bmp

@@ -1,9 +1,3 @@
-cmake_minimum_required(VERSION 3.15)
-project(tinyxml2 VERSION 10.0.0)
-
-include(CTest)
-option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}")
-
 ##
 ## Honor tinyxml2_SHARED_LIBS to match install interface
 ##
@@ -19,7 +13,7 @@ endif ()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
 
-add_library(tinyxml2 tinyxml2.cpp tinyxml2.h)
+add_library(tinyxml2 STATIC tinyxml2.cpp tinyxml2.h)
 add_library(tinyxml2::tinyxml2 ALIAS tinyxml2)
 
 # Uncomment the following line to require C++11 (or greater) to use tinyxml2
@@ -41,94 +35,3 @@ set_target_properties(
     VERSION "${tinyxml2_VERSION}"
     SOVERSION "${tinyxml2_VERSION_MAJOR}"
 )
-
-if (tinyxml2_BUILD_TESTING)
-    add_executable(xmltest xmltest.cpp)
-    target_link_libraries(xmltest PRIVATE tinyxml2::tinyxml2)
-
-    add_test(
-        NAME xmltest
-        COMMAND xmltest
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    )
-
-    set_tests_properties(xmltest PROPERTIES PASS_REGULAR_EXPRESSION ", Fail 0")
-endif ()
-
-##
-## Installation
-##
-
-## Standard modules
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-
-## Custom settings
-option(tinyxml2_INSTALL_PKGCONFIG "Create and install pkgconfig files" ON)
-
-set(tinyxml2_INSTALL_PKGCONFIGDIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
-    CACHE PATH "Directory for pkgconfig files")
-
-set(tinyxml2_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/tinyxml2"
-    CACHE STRING "Path to tinyxml2 CMake files")
-
-## CMake targets and export scripts
-
-install(
-    TARGETS tinyxml2 EXPORT tinyxml2-targets
-    RUNTIME COMPONENT tinyxml2_runtime
-    LIBRARY COMPONENT tinyxml2_runtime
-    NAMELINK_COMPONENT tinyxml2_development
-    ARCHIVE COMPONENT tinyxml2_development
-    INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
-)
-
-# Type-specific targets
-
-if (BUILD_SHARED_LIBS)
-    set(type shared)
-else ()
-    set(type static)
-endif ()
-
-install(
-    EXPORT tinyxml2-targets
-    DESTINATION "${tinyxml2_INSTALL_CMAKEDIR}"
-    NAMESPACE tinyxml2::
-    FILE tinyxml2-${type}-targets.cmake
-    COMPONENT tinyxml2_development
-)
-
-# Auto-generated version compatibility file
-write_basic_package_version_file(
-    tinyxml2-config-version.cmake
-    COMPATIBILITY SameMajorVersion
-)
-
-install(
-    FILES
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/tinyxml2-config.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2-config-version.cmake"
-    DESTINATION "${tinyxml2_INSTALL_CMAKEDIR}"
-    COMPONENT tinyxml2_development
-)
-
-## Headers
-
-install(
-    FILES tinyxml2.h
-    TYPE INCLUDE
-    COMPONENT tinyxml2_development
-)
-
-## pkg-config
-
-if (tinyxml2_INSTALL_PKGCONFIG)
-    configure_file(cmake/tinyxml2.pc.in tinyxml2.pc.gen @ONLY)
-    file(GENERATE OUTPUT tinyxml2.pc INPUT "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc.gen")
-    install(
-        FILES "${CMAKE_CURRENT_BINARY_DIR}/tinyxml2.pc"
-        DESTINATION "${tinyxml2_INSTALL_PKGCONFIGDIR}"
-        COMPONENT tinyxml2_development
-    )
-endif ()

DesktopEmulator/Data/Images/NoSignal.png

@@ -70,7 +70,7 @@ project("Vircon32")
 # Define version
 set(PROJECT_VERSION_MAJOR 25)
 set(PROJECT_VERSION_MINOR 2)
-set(PROJECT_VERSION_PATCH 2)
+set(PROJECT_VERSION_PATCH 3)
 
 # Set names for final executables
 set(C_COMPILER_BINARY_NAME "compile")

DesktopEmulator/Data/Images/Vircon32WindowIcon.bmp

@@ -1,4 +1,3 @@
-# source files to compile XML library tinyxml2
-# (ignore the original CMake script)
-add_library(tinyxml2 STATIC
-    tinyxml2/tinyxml2.cpp)
+# XML library tinyxml2
+# (use the modified CMake script in its folder)
+add_subdirectory(tinyxml2)