1.2.1 RC

CMakeLists.txt

@@ -31,7 +31,7 @@
 cmake_minimum_required(VERSION 3.1)
 enable_testing()
 
-project(Cyan VERSION 1.2.0)
+project(Cyan VERSION 1.2.1)
 
 if(NOT PROJECT_VERSION_TWEAK)
     set(PROJECT_VERSION_TWEAK 0)
@@ -44,8 +44,8 @@ set(CMAKE_AUTORCC ON)
 add_definitions(-DCYAN_VERSION="${PROJECT_VERSION}")
 add_definitions(-DCYAN_GIT="$ENV{GIT}")
 
-set(SOURCES src/main.cpp src/cyan.cpp src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/FXX.cpp res/cyan.qrc docs/docs.qrc)
-set(HEADERS src/cyan.h src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/FXX.h)
+set(SOURCES src/main.cpp src/cyan.cpp src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/openlayerdialog.cpp src/FXX.cpp res/cyan.qrc docs/docs.qrc)
+set(HEADERS src/cyan.h src/imageview.cpp src/profiledialog.cpp src/helpdialog.cpp src/openlayerdialog.h src/FXX.h)
 set(RESOURCE_FILES res/cyan.qrc docs/docs.qrc)
 set(RESOURCE_FOLDER res)
 

cyan.pro

@@ -29,20 +29,22 @@
 # knowledge of the CeCILL license and that you accept its terms.
 
 TARGET = Cyan
-VERSION = 1.2.0
+VERSION = 1.2.1
 
 SOURCES += \
     src/main.cpp \
     src/cyan.cpp \
     src/FXX.cpp \
     src/imageview.cpp \
     src/profiledialog.cpp \
+    src/openlayerdialog.cpp \
     src/helpdialog.cpp
 HEADERS += \
     src/cyan.h \
     src/FXX.h \
     src/imageview.h \
     src/profiledialog.h \
+    src/openlayerdialog.h \
     src/helpdialog.h
 RESOURCES += \
     res/cyan.qrc \

docs/ChangeLog

@@ -1,9 +1,16 @@
+## 1.2.1 - 20181204
+
+* Fixed GIMP 2.10 Windows support
+* Fixed broken Cyan Python plug-in
+* Support XCF (GIMP image format)
+* Support reading layers from XCF, TIFF, PSD
+
 ## 1.2.0 - 20181203
 
  * Major "behind-the-scene" changes
  * Improved performance
  * Save to JPEG
- * Enchanced image information
+ * Enhanced image information
  * Third-party software updates
  * Fixed issues converting HDR images
 

docs/README.md

@@ -8,9 +8,10 @@ Cyan is an open source cross-platform image viewer and converter, designed for [
 
 * Supports RGB/CMYK/GRAY 8/16/32 bit images
 * Supports ICC/ICM v2/v4 color profiles
-* Supports PNG, JPEG, TIFF and PSD image input
+* Supports PNG, JPEG, TIFF, XCF and PSD image input
 * Supports TIFF, JPEG and PSD image output
-* Extract embedded ICC color profiles
+* Supports TIFF, XCF and PSD image layers
+* Extract embedded ICC color profiles from images
 * Add ICC color profile to image
 * Edit ICC color profile tags
 * Convert to and from RGB/CMYK/GRAY
@@ -45,8 +46,8 @@ Cyan is an open source cross-platform image viewer and converter, designed for [
 
 News and updates related to Cyan.
 
+ * [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)
- * [Status report 2018](https://sourceforge.net/p/prepress/blog/2018/11/cyan-2018-status-report/)
 
 # Usage
 ![Promo](https://github.com/rodlie/cyan/raw/master/docs/images/cyan-promo-04.png)
@@ -95,7 +96,7 @@ When you are satisfied with the result just hit save. you can output as JPEG, TI
 # Integration
 ![Promo](https://github.com/rodlie/cyan/raw/master/docs/images/cyan-promo-06.png)
 
-Cyan offers tight integration with [GIMP](https://www.gimp.org) and works as an import/export plug-in in [GIMP](https://www.gimp.org) 2.4+. Just select ``Cyan/Import Image`` or ``Cyan/Export Image``.
+Cyan offers tight integration with [GIMP](https://www.gimp.org) and works as an import/export plug-in in [GIMP](https://www.gimp.org) 2.8+. Just select ``Cyan/Import Image`` or ``Cyan/Export Image``.
 
 ![Promo](https://github.com/rodlie/cyan/raw/master/docs/images/cyan-promo-07.png)
 
@@ -142,4 +143,5 @@ make && make test
 
  ***Do not use or distribute Cyan if any of the unit tests fails!***
 
-![GitHub top language](https://img.shields.io/github/languages/top/rodlie/cyan.svg) ![GitHub language count](https://img.shields.io/github/languages/count/rodlie/cyan.svg) ![SourceForge](https://img.shields.io/sourceforge/dm/prepress.svg) ![Travis (.org)](https://img.shields.io/travis/rodlie/cyan.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/rodlie/cyan.svg) ![GitHub issues](https://img.shields.io/github/issues-raw/rodlie/cyan.svg) ![GitHub closed issues](https://img.shields.io/github/issues-closed/rodlie/cyan.svg) [![GitHub release](https://img.shields.io/github/release/rodlie/cyan.svg)](https://github.com/rodlie/cyan/releases) [![Github commits (since latest release)](https://img.shields.io/github/commits-since/rodlie/cyan/latest.svg)](https://github.com/rodlie/cyan)
+![GitHub top language](https://img.shields.io/github/languages/top/rodlie/cyan.svg) ![GitHub language count](https://img.shields.io/github/languages/count/rodlie/cyan.svg) ![SourceForge](https://img.shields.io/sourceforge/dm/prepress.svg) 
+![GitHub Releases](https://img.shields.io/github/downloads/rodlie/cyan/latest/total.svg) ![Travis (.org)](https://img.shields.io/travis/rodlie/cyan.svg) ![GitHub last commit](https://img.shields.io/github/last-commit/rodlie/cyan.svg) ![GitHub issues](https://img.shields.io/github/issues-raw/rodlie/cyan.svg) ![GitHub closed issues](https://img.shields.io/github/issues-closed/rodlie/cyan.svg) [![GitHub release](https://img.shields.io/github/release/rodlie/cyan.svg)](https://github.com/rodlie/cyan/releases) [![Github commits (since latest release)](https://img.shields.io/github/commits-since/rodlie/cyan/latest.svg)](https://github.com/rodlie/cyan)

docs/cyan.html

@@ -13,8 +13,9 @@ <h1 id="features">Features</h1>
 <ul>
   <li>Supports RGB/CMYK/GRAY 8/16/32 bit images</li>
   <li>Supports ICC/ICM v2/v4 color profiles</li>
-  <li>Supports PNG, JPEG, TIFF and PSD image input</li>
+  <li>Supports PNG, JPEG, TIFF, XCF and PSD image input</li>
   <li>Supports TIFF, JPEG and PSD image output</li>
+  <li>Supports TIFF, XCF and PSD image layers</li>
   <li>Extract embedded ICC color profiles</li>
   <li>Add ICC color profile to image</li>
   <li>Edit ICC color profile tags</li>
@@ -73,7 +74,7 @@ <h2 id="mousekeyboard">Mouse/Keyboard</h2>
 <h1 id="integration">Integration</h1>
 <p align="center"><img src=":/docs/images/cyan-promo-06.png" alt="Promo"></p>
 
-<p align="justify">Cyan offers tight integration with <a href="https://www.gimp.org">GIMP</a> and works as an import/export plug-in in <a href="https://www.gimp.org">GIMP</a> 2.4+. Just select <code class="highlighter-rouge">Cyan/Import Image</code> or <code class="highlighter-rouge">Cyan/Export Image</code>.</p>
+<p align="justify">Cyan offers tight integration with <a href="https://www.gimp.org">GIMP</a> and works as an import/export plug-in in <a href="https://www.gimp.org">GIMP</a> 2.8+. Just select <code class="highlighter-rouge">Cyan/Import Image</code> or <code class="highlighter-rouge">Cyan/Export Image</code>.</p>
 
 <p align="center"><img src=":/docs/images/cyan-promo-07.png" alt="Promo" /></p>
 

res/gimp.py

@@ -1,37 +1,5 @@
 #!/usr/bin/env python
 
-'''
-# Copyright Ole-André Rodlie, INRIA.
-#
-# ole.andre.rodlie@gmail.com
-#
-# 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".
-#
-# As a counterpart to the access to the source code and rights to
-# modify and redistribute granted by the license, users are provided only
-# with a limited warranty and the software's author, the holder of the
-# economic rights and the subsequent licensors have only limited
-# liability.
-#
-# In this respect, the user's attention is drawn to the associated risks
-# with loading, using, modifying and / or developing or reproducing the
-# software by the user in light of its specific status of free software,
-# that can mean that it is complicated to manipulate, and that also
-# so that it is for developers and experienced
-# professionals having in-depth computer knowledge. Users are therefore
-# encouraged to test and test the software's suitability
-# Requirements in the conditions of their systems
-# data to be ensured and, more generally, to use and operate
-# same conditions as regards security.
-#
-# The fact that you are presently reading this means that you have had
-# knowledge of the CeCILL license and that you accept its terms.
-'''
-
 from gimpfu import *
 import subprocess
 import os
@@ -41,7 +9,7 @@
 import os.path
 import tempfile
 
-cyanversion = "1.2.0"
+cyanversion = "1.2.1"
 cyanbin = "cyan"
 
 def plugin_maketempfile( image, src ):