Merge branch 'stable'

Bumped version to 0.1.3

CHANGELOG

@@ -1,3 +1,26 @@
+=========================================
+Version 0.1.3
+
+- Fixed opacity blending of "Color" mode in RGB and Lab colorspaces
+- Fixed opacity blending of "Luminosity" mode in Lab colorspace
+- Fixed filling of layer list of clone tool: for clone layers inserted
+  in layer masks, the parent layer was incorrectly included in the list,
+  leading to a possible unresolvable circular dependency between 
+  the clone layer and its source. Now the parent layer is not included
+  anymore in the list of possible clone sources.
+- original "visible" flag of layers renamed to "enabled", and added a new "visible"
+  flag to indicate if a given layer is either directly hidden or indirectly hidden
+  because some of its parents are hidden.
+  The "enabled" flag now indicates if the layer is directly hidden.
+- Removed fatal assertion on the validity of the output image from layer extra inputs.
+  Now if the image is invalid a NULL pointer is simply added to the list of extra inputs,
+  without causing a program crash. Nevertheless, a notification mechanism should be
+  introduced to inform the user of the abnormal situation.
+- Fixed corruption of RAW image metadata at zoom levels below 100%
+- Fixed bug in the image preview at program startup
+- Fixed several clang compilation warnings
+
+
 =========================================
 Version 0.1.2
 

CMakeLists.txt

@@ -70,6 +70,7 @@ endif()
   MESSAGE( STATUS "GTKMM3_FOUND:         " ${GTKMM3_FOUND} )
 
 
+IF(NOT MINGW)
 #need to put here do setting LOCALE_DIR variable
 if(USE_NLS)
 find_package(Gettext)
@@ -91,6 +92,8 @@ if(Gettext_FOUND)
 	endif(NOT LOCALE_DIR)
 endif(Gettext_FOUND)
 endif(USE_NLS)
+ENDIF(NOT MINGW)
+MESSAGE( STATUS "Msgfmt_FOUND:         " ${Msgfmt_FOUND} )
 
 
 add_subdirectory(src) 

VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

src/base/blend_color.hh

@@ -55,16 +55,17 @@ class BlendColor<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
 {
   int pos, ch;
   double temp_top;
-  double rgb[3];
+  double irgb[3], rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     // RGB values of the bottom layer
-    double ired = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
-    double igreen = (double(bottom[x+1]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
-    double iblue = (double(bottom[x+2]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    // RGB values of the bottom layer
+    irgb[0] = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    irgb[1] = (double(bottom[x+1]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
+    irgb[2] = (double(bottom[x+2]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
     // Luminance value of the bottom layer
-    double lumi = PF::luminance( ired, igreen, iblue );
+    double lumi = PF::luminance( irgb[0], irgb[1], irgb[2] );
 
     // RGB values of the top layer
     double ored = (double(top[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
@@ -78,7 +79,7 @@ public:
 
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
-      out[pos] = (T)(( (rgb[ch]*opacity)+(rgb[ch]*(1.0f-opacity)) )*FormatInfo<T>::RANGE - FormatInfo<T>::MIN);
+      out[pos] = (T)(( (rgb[ch]*opacity)+(irgb[ch]*(1.0f-opacity)) )*FormatInfo<T>::RANGE - FormatInfo<T>::MIN);
     }
   }
 };
@@ -112,13 +113,13 @@ class BlendColor<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
   double temp_top;
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=0; ch++, pos++ ) 
       out[pos] = bottom[pos];
     for( ; ch<=CHMAX; ch++, pos++ ) 
-      out[pos] = top[pos];
+      out[pos] = static_cast<T>( opacity*top[pos]+(1.0f-opacity)*bottom[pos] );
   }
 };
 

src/base/blend_grain_extract.hh

@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendGrainExtract: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendGrainExtract<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -68,7 +67,7 @@ class BlendGrainExtract<T, CS, CHMIN, CHMAX, true>:
   typename FormatInfo<T>::PROMOTED ptop;
   float opacity_real;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap)
   {
     opacity_real = opacity*(this->pmap[xomap]+FormatInfo<T>::MIN)/(FormatInfo<T>::RANGE);
     xomap += 1;

src/base/blend_grain_merge.hh

@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendGrainMerge: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendGrainMerge<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::SIGNED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {

src/base/blend_hard_light.hh

@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendHardLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 

src/base/blend_lighten.hh

@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendLighten: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendLighten<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   T temp_top;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -94,7 +93,7 @@ class BlendLighten<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
 {
   T temp_top;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     if( bottom[x]>top[x] ) temp_top = bottom[x];
     else temp_top = top[x];

src/base/blend_luminosity.hh

@@ -58,7 +58,7 @@ class BlendLuminosity<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
   double irgb[3];
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     // RGB values of the bottom layer
     irgb[0] = (double(bottom[x]) + FormatInfo<T>::MIN)/FormatInfo<T>::RANGE;
@@ -113,11 +113,11 @@ class BlendLuminosity<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
   double temp_top;
   double rgb[3];
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=0; ch++, pos++ ) 
-      out[pos] = top[pos];
+      out[pos] = static_cast<T>( opacity*top[pos]+(1.0f-opacity)*bottom[pos] );
     for( ; ch<=CHMAX; ch++, pos++ ) 
       out[pos] = bottom[pos];
   }

src/base/blend_multiply.hh

@@ -33,9 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendMultiply: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -47,7 +46,7 @@ class BlendMultiply<T, CS, CHMIN, CHMAX, false>:
   int ch, pos;
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     for( ch=CHMIN; ch<=CHMAX; ch++, pos++ ) {
@@ -95,7 +94,7 @@ class BlendMultiply<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
 {
   typename FormatInfo<T>::PROMOTED ptop;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     ptop = top[x];
     ptop *= bottom[x];

src/base/blend_normal.hh

@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendNormal: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -45,7 +46,7 @@ class BlendNormal<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>:
   public BlendBase<T, PF_COLORSPACE_GRAYSCALE, CHMIN, CHMAX, false>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     out[x] = (T)(opacity*top[x] + (1.0f-opacity)*bottom[x]);
   }
@@ -74,7 +75,7 @@ class BlendNormal<T, PF_COLORSPACE_RGB, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended
@@ -135,7 +136,7 @@ class BlendNormal<T, PF_COLORSPACE_LAB, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended
@@ -190,7 +191,7 @@ class BlendNormal<T, PF_COLORSPACE_CMYK, CHMIN, CHMAX, false>:
 {
   int ch, pos;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     // The target channel(s) get blended

src/base/blend_overlay.hh

@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendOverlay: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -50,7 +51,7 @@ class BlendOverlay<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendOverlay(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;

src/base/blend_passthrough.hh

@@ -34,7 +34,6 @@ class BlendPassthrough: public BlendBase<T, CS, CHMIN, CHMAX, has_omap>
 {
   int ch;
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
-  {
-  }
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };

src/base/blend_screen.hh

@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendScreen: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -50,7 +51,7 @@ class BlendScreen<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendScreen(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;

src/base/blend_soft_light.hh

@@ -33,7 +33,8 @@ template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_oma
 class BlendSoftLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -55,7 +56,7 @@ public:
                     psum((typename FormatInfo<T>::PROMOTED)(FormatInfo<T>::MAX) + FormatInfo<T>::MIN), 
                     MAX2((typename FormatInfo<T>::PROMOTED)(FormatInfo<T>::MAX)*FormatInfo<T>::MAX),
                     sqrtMAX( sqrt(FormatInfo<T>::MAX) ) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
     pos = x;
     //psum = FormatInfo<T>::MAX + FormatInfo<T>::MIN;

src/base/blend_vivid_light.hh

@@ -31,6 +31,7 @@
 //#include "vivid_light.hh"
 
 
+/*
 static float color_burn(float top, float bottom)
 {
   if( top == 1 ) return 0;
@@ -46,13 +47,15 @@ static float color_dodge(float top, float bottom)
   float result = bottom / (1.0f-top);
   return( (result>1) ? 1 : result );
 }
+*/
 
 
 template<typename T, colorspace_t colorspace, int CHMIN, int CHMAX, bool has_omap>
 class BlendVividLight: public BlendBase<T, colorspace, CHMIN, CHMAX, has_omap>
 {
 public:
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) {}
+  void blend(const float& /*opacity*/, T* /*bottom*/, T* /*top*/,
+      T* /*out*/, const int& /*x*/, int& /*xomap*/) {}
 };
 
 
@@ -70,7 +73,7 @@ class BlendVividLight<T, CS, CHMIN, CHMAX, false>:
   typename FormatInfo<T>::PROMOTED psum;
 public:
   BlendVividLight(): BlendBase<T, CS, CHMIN, CHMAX, false>(), psum(FormatInfo<T>::MAX + FormatInfo<T>::MIN) {}
-  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& xomap) 
+  void blend(const float& opacity, T* bottom, T* top, T* out, const int& x, int& /*xomap*/)
   {
 #ifdef DO_WARNINGS
 #warning "TODO: optimize vivid light blend"

src/base/cachebuffer.cc

@@ -107,7 +107,7 @@ void PF::CacheBuffer::step()
     lseek( fd, offset, SEEK_SET );
     p = VIPS_REGION_ADDR( reg, tile_area.left, tile_area.top+y );
     ssize_t n = ::write( fd, p, VIPS_REGION_SIZEOF_LINE(reg) );
-    if( n != VIPS_REGION_SIZEOF_LINE(reg) )
+    if( n != (ssize_t)VIPS_REGION_SIZEOF_LINE(reg) )
       break;
     offset += VIPS_IMAGE_SIZEOF_LINE(image);
   }