merge to gpu dev branch

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: onecoolx

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,89 @@
+name: CMake Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+
+      # Set up a matrix to run the following 3 configurations:
+      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
+      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
+      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
+      #
+      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        build_type: [Debug, Release]
+        c_compiler: [gcc, clang, cl]
+        include:
+          - os: windows-latest
+            c_compiler: cl
+            cpp_compiler: cl
+          - os: ubuntu-latest
+            c_compiler: gcc
+            cpp_compiler: g++
+          - os: ubuntu-latest
+            c_compiler: clang
+            cpp_compiler: clang++
+          - os: macos-latest
+            c_compiler: clang
+            cpp_compiler: clang++
+        exclude:
+          - os: windows-latest
+            c_compiler: gcc
+          - os: windows-latest
+            c_compiler: clang
+          - os: ubuntu-latest
+            c_compiler: cl
+          - os: macos-latest
+            c_compiler: cl
+          - os: macos-latest
+            c_compiler: gcc
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - if: ${{matrix.os == 'ubuntu-latest'}}
+      run: |
+        sudo apt-get install libgtk2.0-dev
+
+    - if: ${{matrix.os == 'macos-latest'}}
+      run: |
+        python -m pip install --upgrade pip setuptools wheel packaging
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -DOPT_UNITTEST=ON
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+    - name: Test
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest --build-config ${{ matrix.build_type }}

.github/workflows/linux-cpp.yml

@@ -13,11 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: auto gen
-      run: ./autogen.sh
-    - name: configure
-      run: ./configure
+    - name: Setup GTK2
+      run: sudo apt-get install libgtk2.0-dev
+    - name: Generate Project
+      run: ./build_linux.sh
     - name: make
-      run: make
-    - name: make check
-      run: make check  
+      run: make -C ./proj

.github/workflows/macosx-cpp.yml

@@ -8,12 +8,10 @@ on:
 
 jobs:
   build:
-
     runs-on: macos-latest
-
     steps:
     - uses: actions/checkout@v2
-    - name: gen proj
+    - name: Generate Project
       run: ./build_macosx.sh
     - name: build
       run: xcodebuild -project ./proj/picasso.xcodeproj

.github/workflows/windows-cpp.yml

@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        configuration: [Debug, Release]
+        configuration: [Debug, Release, MinSizeRel, RelWithDebInfo]
 
     runs-on: windows-latest
 
@@ -22,22 +22,17 @@ jobs:
 
     - name: Setup MSBuild.exe
       uses: microsoft/setup-msbuild@v1.0.2
-
-    - name: Set up Python 2.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 2.7
-
+
     - name: Generate Project
       run: ./build_windows.bat
-
+      
     - name: Restore Project
-      run: msbuild ./vcproj/picasso.sln /t:Restore /p:Configuration=$env:Configuration
+      run: msbuild ./proj/picasso.sln /t:Restore /p:Configuration=$env:Configuration
       env:
         Configuration: ${{ matrix.configuration }}
 
     - name: Build Solution
-      run: msbuild ./vcproj/picasso.sln /p:Configuration=$env:Configuration
+      run: msbuild ./proj/picasso.sln /p:Configuration=$env:Configuration
       env:
         Configuration: ${{ matrix.configuration }}   
 

.gitignore

@@ -0,0 +1,2 @@
+tags
+proj

AUTHORS

@@ -1,3 +1,3 @@
-Picasso - Version 2.5
+Picasso - Version 2.8
 A high quality vector graphic rendering library
-Copyright (C) 2008 ~ 2023 Zhang Ji Peng  (onecoolx@gmail.com)
+Copyright (C) 2008 ~ 2024 Zhang Ji Peng  (onecoolx@gmail.com)

CMakeLists.txt

@@ -0,0 +1,134 @@
+cmake_minimum_required(VERSION 3.16.0)
+
+project(picasso LANGUAGES C CXX ASM HOMEPAGE_URL https://onecoolx.github.io/picasso/)
+
+set(PROJECT_ROOT ${CMAKE_CURRENT_LIST_DIR})
+set(PROJECT_OUT ${CMAKE_CURRENT_BINARY_DIR})
+
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 8)
+set(VERSION_MICRO 0)
+set(VERSION_INFO ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO})
+
+option(BUILD_SHARED_LIBS "Build shared libraries (default)" ON)
+
+option(OPT_FORMAT_ABGR "Pixel format ABGR support." ON)
+option(OPT_FORMAT_ARGB "Pixel format ARGB support." ON)
+option(OPT_FORMAT_BGRA "Pixel format BGRA support." ON)
+option(OPT_FORMAT_RGBA "Pixel format RGBA support." ON)
+option(OPT_FORMAT_RGB "Pixel format RGB support." ON)
+option(OPT_FORMAT_BGR "Pixel format BGR support." ON)
+option(OPT_FORMAT_RGB565 "Pixel format RGB565 support." ON)
+option(OPT_FORMAT_RGB555 "Pixel format RGB555 support." ON)
+option(OPT_FORMAT_A8 "Pixel format A8 support." ON)
+
+option(OPT_FAST_COPY "Build Fast Memory Copy used support." OFF)
+option(OPT_FREE_TYPE2 "Build FreeType2 is support." OFF)
+option(OPT_FONT_CONFIG "Build FontConfig is support." OFF)
+option(OPT_LOW_MEMORY "Build Low Memory used support." OFF)
+option(OPT_SYSTEM_MALLOC "Build System Memory Allocator (new/delete/malloc/free/realloc/calloc) used support." OFF)
+
+option(OPT_EXTENSIONS "Build extension libraries." ON)
+
+option(OPT_TESTS "Build test apps" ON)
+option(OPT_DEMOS "Build example demos" ON)
+option(OPT_UNITTEST "Build unit tests" OFF)
+option(OPT_SANITIZE "Build with Sanitizer" OFF)
+option(OPT_COVERAGE "Build with Coverage" OFF)
+
+if (NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE)
+endif()
+
+include (${CMAKE_CURRENT_LIST_DIR}/build/configs.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/build/defines.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/src/src.cmake)
+
+if (OPT_EXTENSIONS)
+include (${CMAKE_CURRENT_LIST_DIR}/third_party/third_party.cmake)
+include (${CMAKE_CURRENT_LIST_DIR}/ext/ext.cmake)
+endif()
+
+include (${CMAKE_CURRENT_LIST_DIR}/include/include.cmake)
+
+if (OPT_TESTS)
+include (${CMAKE_CURRENT_LIST_DIR}/test/test.cmake)
+endif()
+
+if (OPT_DEMOS)
+include (${CMAKE_CURRENT_LIST_DIR}/demos/demos.cmake)
+endif()
+
+if (OPT_UNITTEST)
+enable_testing()
+include (${CMAKE_CURRENT_LIST_DIR}/unit_tests/unit_tests.cmake)
+endif(OPT_UNITTEST)
+
+include(CheckIncludeFile)
+check_include_file(stdint.h HAVE_STDINT_H)
+check_include_file(stdlib.h HAVE_STDLIB_H)
+check_include_file(stddef.h HAVE_STDDEF_H)
+check_include_file(string.h HAVE_STRING_H)
+check_include_file(memory.h HAVE_MEMORY_H)
+
+if (OPT_FORMAT_ABGR)
+    set(ENABLE_FORMAT_ABGR 1)
+endif(OPT_FORMAT_ABGR)
+
+if (OPT_FORMAT_ARGB)
+    set(ENABLE_FORMAT_ARGB 1)
+endif(OPT_FORMAT_ARGB)
+
+if (OPT_FORMAT_BGRA)
+    set(ENABLE_FORMAT_BGRA 1)
+endif(OPT_FORMAT_BGRA)
+
+if (OPT_FORMAT_RGBA)
+    set(ENABLE_FORMAT_RGBA 1)
+endif(OPT_FORMAT_RGBA)
+
+if (OPT_FORMAT_RGB)
+    set(ENABLE_FORMAT_RGB 1)
+endif(OPT_FORMAT_RGB)
+
+if (OPT_FORMAT_BGR)
+    set(ENABLE_FORMAT_BGR 1)
+endif(OPT_FORMAT_BGR)
+
+if (OPT_FORMAT_RGB565)
+    set(ENABLE_FORMAT_RGB565 1)
+endif(OPT_FORMAT_RGB565)
+
+if (OPT_FORMAT_RGB555)
+    set(ENABLE_FORMAT_RGB555 1)
+endif(OPT_FORMAT_RGB555)
+
+if (OPT_FORMAT_A8)
+    set(ENABLE_FORMAT_A8 1)
+endif(OPT_FORMAT_A8)
+
+if (OPT_FAST_COPY)
+    set(ENABLE_FAST_COPY 1)
+endif(OPT_FAST_COPY)
+
+if (OPT_FREE_TYPE2)
+    set(ENABLE_FREE_TYPE2 1)
+endif(OPT_FREE_TYPE2)
+
+if (OPT_FONT_CONFIG)
+    set(ENABLE_FONT_CONFIG 1)
+endif(OPT_FONT_CONFIG)
+
+if (OPT_LOW_MEMORY)
+    set(ENABLE_LOW_MEMORY 1)
+endif(OPT_LOW_MEMORY)
+
+if (OPT_SYSTEM_MALLOC)
+    set(ENABLE_SYSTEM_MALLOC 1)
+endif(OPT_SYSTEM_MALLOC)
+
+configure_file(
+    "${PROJECT_ROOT}/build/pconfig.h.in"
+    "${PROJECT_OUT}/include/pconfig.h"
+)
+

ChangeLog

@@ -9,6 +9,7 @@
 
 2013-02-12: Version 2.0.0
     Update code version 2.0.0 alpha.
+    Change to BSD license.
 
 2014-07-16: Version 2.0.1
     Fix font glyph advance_x bug.
@@ -40,3 +41,7 @@
 2023-2-17: Version 2.5.0
     Update code version 2.5.0
     Full support macosx system.
+
+2024-7-16: Version 2.8.0
+    Update code version 2.8.0
+    Full build with cmake.

Doxyfile

@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "Picasso API"
-PROJECT_NUMBER         = 2.5
+PROJECT_NUMBER         = 2.8
 OUTPUT_DIRECTORY       = ./doc/
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English

COPYING → LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014, Zhang Ji Peng <onecoolx@gmail.com>
+Copyright (c) 2024, Zhang Ji Peng <onecoolx@gmail.com>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README

@@ -1,36 +1,24 @@
 HOW TO BUILD:
 ------------------------------------
 linux:
-
-1. automake & autoconf
-./autogen.sh
-./configure
-make
-sudo make install;
-
-
-2. gyp build
+1. Install cmake above v3.16 on your system
+2. Build project
 ./build_linux.sh
 cd proj
 make
 
-
 ------------------------------------
 windows:
-
-1. Install Active Python 2.7 on your windows system and register path environment variables.
-
+1. Install cmake above v3.16 on your windows system and register path environment variables.
 2. Build project
 ./build_windows.bat
-cd vcproj
+cd proj
 <open "picasso.sln" with visual studio>
 
 
 -------------------------------------
 macosx:
-
 1. Install python 2.7 on your shell environment.
-
 2. Build project
 ./build_macosx.sh
 cd proj