Merge branch '1.2' into dev

.gitignore

@@ -21,3 +21,5 @@ sdk
 *.zip
 CHANGES
 .DS_Store
+deploy
+mxe

CMakeLists.txt

@@ -55,16 +55,15 @@ set(TEST_HEADERS src/FXX.h)
 set(TEST_RESOURCE_FILES res/tests.qrc)
 
 set(COMPANY "Cyan")
-set(COPYRIGHT "Copyright Ole-Andre Rodlie, INRIA, FxArena DA. All rights reserved.")
+set(COPYRIGHT "Copyright Ole-Andre Rodlie. All rights reserved.")
 set(IDENTIFIER "net.fxarena.cyan")
 
-if(CMAKE_BUILD_TYPE MATCHES RELEASE)
+if(CMAKE_BUILD_TYPE MATCHES "^(release|Release|RELEASE)$")
     add_definitions(-DQT_NO_DEBUG_OUTPUT)
 endif()
 
 if(APPLE)
     set(ICON_FILE ${RESOURCE_FOLDER}/${PROJECT_NAME}.icns)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.7")
     set_source_files_properties(${PROJECT_NAME}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_BUNDLE_NAME ${PROJECT_NAME})
     set(MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION})
@@ -84,7 +83,7 @@ find_package(Qt5 5.9 REQUIRED Core Gui Widgets Concurrent Test)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../lib/cmake/modules/")
 
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 
 option(DEPLOY "Deploy" OFF)
 option(USE_PKG_CONFIG "Use pkg-config" ON)
@@ -113,28 +112,24 @@ else()
     find_package(ImageMagick COMPONENTS Magick++ REQUIRED)
     include_directories(${ImageMagick_INCLUDE_DIRS})
     add_compile_options(${MAGICK_CFLAGS})
-    if(USE_Q32)
-        add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=32)
-    else()
-        add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16)
-    endif()
-        add_definitions(-DMAGICKCORE_HDRI_ENABLE=1)
+    add_definitions(-DMAGICKCORE_QUANTUM_DEPTH=16)
+    add_definitions(-DMAGICKCORE_HDRI_ENABLE=1)
 endif()
 
 add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${RESOURCES_FILES})
 add_executable(tests ${TEST_SOURCES} ${TEST_HEADERS} ${TEST_RESOURCES_FILES})
 
 target_link_libraries(${PROJECT_NAME} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Concurrent)
-target_link_libraries(tests Qt5::Test)
+target_link_libraries(tests Qt5::Core Qt5::Gui Qt5::Test)
 
-if(MINGW AND DEPLOY)
-    target_link_libraries(${PROJECT_NAME} Threads::Threads)
+if(MINGW)
+    target_link_libraries(${PROJECT_NAME} kernel32)
 endif()
 
 if(USE_PKG_CONFIG)
     if (DEPLOY)
-        target_link_libraries(${PROJECT_NAME} ${MAGICK_STATIC_LIBRARIES} ${LCMS2_LIBRARIES} ${MAGICK_LDFLAGS} ${LCMS2_LDFLAGS})
-        target_link_libraries(tests ${MAGICK_STATIC_LIBRARIES} ${LCMS2_LIBRARIES} ${MAGICK_LDFLAGS} ${LCMS2_LDFLAGS})
+        target_link_libraries(${PROJECT_NAME} ${MAGICK_STATIC_LIBRARIES} ${LCMS2_STATIC_LIBRARIES} ${MAGICK_STATIC_LDFLAGS} ${LCMS2_STATIC_LDFLAGS})
+        target_link_libraries(tests ${MAGICK_STATIC_LIBRARIES} ${LCMS2_STATIC_LIBRARIES} ${MAGICK_STATIC_LDFLAGS} ${LCMS2_STATIC_LDFLAGS})
     else()
         target_link_libraries(${PROJECT_NAME} ${MAGICK_LIBRARIES} ${LCMS2_LIBRARIES} ${MAGICK_LDFLAGS} ${LCMS2_LDFLAGS})
         target_link_libraries(tests ${MAGICK_LIBRARIES} ${LCMS2_LIBRARIES} ${MAGICK_LDFLAGS} ${LCMS2_LDFLAGS})

cyan.pro

@@ -28,6 +28,8 @@
 # The fact that you are presently reading this means that you have had
 # knowledge of the CeCILL license and that you accept its terms.
 
+# USED FOR OFFICIAL BINARIES, USE CMAKE INSTEAD!
+
 TARGET = Cyan
 VERSION = 1.2.99
 
@@ -46,6 +48,7 @@ HEADERS += \
     src/helpdialog.h
 RESOURCES += \
     res/cyan.qrc \
+    res/fonts.qrc \
     docs/docs.qrc
 
 DESTDIR = build
@@ -77,7 +80,10 @@ DEFINES += CYAN_GIT=\"\\\"$${GIT}\\\"\"
 QMAKE_TARGET_COMPANY = "$${TARGET}"
 QMAKE_TARGET_PRODUCT = "$${TARGET}"
 QMAKE_TARGET_DESCRIPTION = "$${TARGET}"
-QMAKE_TARGET_COPYRIGHT = "Copyright Ole-Andre Rodlie, INRIA"
+QMAKE_TARGET_COPYRIGHT = "Copyright Ole-Andre Rodlie"
+
+DEFINES += DEPLOY
+unix:!mac: DEFINES += BUNDLE_FONT
 
 CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
 
@@ -127,12 +133,13 @@ unix:!mac {
 mac {
     ICON = res/Cyan.icns
     QMAKE_INFO_PLIST = res/Info.plist
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13
-    QMAKE_CXXFLAGS += -fopenmp
-    QMAKE_LFLAGS += -fopenmp
+    #QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
+    #QMAKE_CXXFLAGS += -fopenmp
+    #QMAKE_LFLAGS += -fopenmp
 }
 
 win32 {
     RC_ICONS += res/cyan.ico
-    LIBS += -lpthread
+    #LIBS += -lpthread
+    LIBS += -lkernel32
 }

docs/ChangeLog.md

@@ -3,15 +3,14 @@
  * Enhanced layer support
  * UI changes
 
-## 1.2.3 - 20220313
+## 1.2.3 - 20220318
 
- * Minor UI fixes
+ * Fixed some (not all) UI scaling issues
  * Windows fixes
- * Several Gimp compatibility fixes
+ * Gimp compatibility fixes
  * Fixed issues when loading some TIFF images
- * Improved ImageMagick memory resource handler
- * Downgraded to ImageMagick 6.9 (still compatible with 7.x)
-   * ImageMagick 7.x has OpenMP issues on MinGW and macOS
+ * Improved ImageMagick compatibility
+ * Fixed compatibility with Qt 5.15
  * Updated third-party software (included in binaries)
 
 ## 1.2.2 - 20191103

docs/README.md

@@ -1,12 +1,14 @@
 # Cyan
 
-Cyan is an open source cross-platform image viewer and converter, designed for [prepress](https://en.wikipedia.org/wiki/Prepress) (print) work. Like converting an image from [RGB](https://en.wikipedia.org/wiki/RGB_color_model) to [CMYK](https://en.wikipedia.org/wiki/CMYK_color_model), or the other way around. Cyan supports [color profiles](https://en.wikipedia.org/wiki/ICC_profile) complying with the [International Color Consortium](http://www.color.org/index.xalter) (ICC) standard, and strives to create as color-accurate images as possible, with support for [RGB](https://en.wikipedia.org/wiki/RGB_color_model), [CMYK](https://en.wikipedia.org/wiki/CMYK_color_model) and [GRAY](https://en.wikipedia.org/wiki/Grayscale) with up to [32-bit](https://en.wikipedia.org/wiki/32-bit) image depth.
+Cyan is an open source cross-platform image viewer and converter, designed for [prepress](https://en.wikipedia.org/wiki/Prepress) (print) work. Like converting an image from [RGB](https://en.wikipedia.org/wiki/RGB_color_model) to [CMYK](https://en.wikipedia.org/wiki/CMYK_color_model), or the other way around. Cyan supports [color profiles](https://en.wikipedia.org/wiki/ICC_profile) complying with the [International Color Consortium](http://www.color.org/index.xalter) (ICC) standard, and strives to create as color-accurate images as possible, with support for [RGB](https://en.wikipedia.org/wiki/RGB_color_model), [CMYK](https://en.wikipedia.org/wiki/CMYK_color_model) and [GRAY](https://en.wikipedia.org/wiki/Grayscale).
 
-![Promo](https://github.com/rodlie/cyan/raw/1.2/docs/images/cyan-promo-01.png)
+<img src="images/oss-users-love-us-white.svg" height="150"><img src="images/oss-community-choice-white.svg" height="150">
+
+[![Download](https://a.fsdn.com/con/app/sf-download-button)](https://github.com/rodlie/cyan/releases/latest)
 
 # Features
 
-* Supports RGB/CMYK/GRAY 8/16/32 bit images
+* Supports RGB/CMYK/GRAY images
 * Supports ICC/ICM v2/v4 color profiles
 * Supports PNG, JPEG, TIFF, XCF and PSD image input
 * Supports TIFF, JPEG and PSD image output
@@ -20,17 +22,16 @@ Cyan is an open source cross-platform image viewer and converter, designed for [
 * Color convert images with layers (PSD/TIFF)
 
 # News
-![Promo](https://github.com/rodlie/cyan/raw/1.2/docs/images/cyan-promo-02.png)
+![Promo](images/cyan-promo-02.png)
 
 News and updates related to Cyan.
 
+ * [Cyan 1.2.3 released](https://github.com/rodlie/cyan/releases/tag/1.2.3)
  * [Cyan 1.2.2 released](https://github.com/rodlie/cyan/releases/tag/1.2.2)
  * [Cyan 1.2.1 released](https://github.com/rodlie/cyan/releases/tag/1.2.1)
  * [Cyan 1.2.0 released](https://github.com/rodlie/cyan/releases/tag/1.2.0)
- * [The (long) road to Cyan 2](https://github.com/rodlie/cyan/issues/12)
-
 
 # Open Source
-![Promo](https://github.com/rodlie/cyan/raw/1.2/docs/images/cyan-promo-05.png)
+![Promo](images/cyan-promo-05.png)
 
 This software is governed by the CeCILL license under French law and abiding by the rules of distribution of free software. You can use, modify and / or redistribute the software under the terms of the CeCILL license as circulated by CEA, CNRS and INRIA at the following URL https://www.cecill.info.

docs/_config.yml

@@ -2,4 +2,8 @@ theme: jekyll-theme-minimal
 title: Cyan
 description: Open source prepress image viewer and converter
 logo: https://github.com/rodlie/cyan/raw/1.2/res/hicolor/256x256/apps/cyan.png
-show_downloads: false
+show_downloads: true
+
+github:
+  zip_url: https://sourceforge.net/projects/prepress/files/1.2.3/Cyan-1.2.3-Windows-x64.zip/download
+  tar_url: https://sourceforge.net/projects/prepress/files/1.2.3/Cyan-1.2.3-Linux-x86_64.zip/download

docs/_layouts/default.html

@@ -19,12 +19,12 @@
         {% endif %}
 
         <!-- <a target="_blank" href="https://sourceforge.net/projects/prepress/files/latest/download"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a> -->
-        <a target="_blank" href="https://github.com/rodlie/cyan/releases/latest"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a>
+        <!-- <a target="_blank" href="https://github.com/rodlie/cyan/releases/latest"><img alt="Download Cyan" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a> -->
 
         {% if site.show_downloads %}
         <ul class="downloads">
-          <li><a href="{{ site.github.zip_url }}">Download <strong>ZIP File</strong></a></li>
-          <li><a href="{{ site.github.tar_url }}">Download <strong>TAR Ball</strong></a></li>
+          <li><a href="{{ site.github.zip_url }}">Download for <strong>Windows</strong></a></li>
+          <li><a href="{{ site.github.tar_url }}">Download for <strong>Linux</strong></a></li>
           <li><a href="{{ site.github.repository_url }}">View On <strong>GitHub</strong></a></li>
         </ul>
         {% endif %}

docs/cyan.html

@@ -91,9 +91,5 @@ <h1 id="open-source">Open Source</h1>
 _3RDPARTY_
 </p>
 
-<p align="justify">Hosted on <a href="https://github.com/rodlie/cyan">Github</a> and <a href="https://sourceforge.net/projects/prepress">Sourceforge</a>.</p>
-
-<p></p>
-
 </body>
 </html>