- Reestructuración de ficheros y directorios general

- merge v0.01 --> Añadido fileselector - Añadidas fuentes de Gem y Pure Data - pix2jpg incluído en Gem. Archivos de construcción de Gem modificados. - Añadido fichero ompiling.txt con instrucciones de compilación
2013-02-04 18:00:17 +01:00 · 2013-02-04 18:00:17 +01:00 · e85d191b46
commit e85d191b46
parent c9adfd020b
3100 changed files with 775434 additions and 3073 deletions
--- a/Gem/plugins/imageMAGICK/MagickPlusPlus.cpp
+++ b/Gem/plugins/imageMAGICK/MagickPlusPlus.cpp
@ -0,0 +1,122 @@
+////////////////////////////////////////////////////////
+//
+// GEM - Graphics Environment for Multimedia
+//
+// zmoelnig@iem.kug.ac.at
+//
+// Implementation file
+//
+//    Copyright (c) 1997-1999 Mark Danks.
+//    Copyright (c) Günther Geiger.
+//    Copyright (c) 2001-2011 IOhannes m zmölnig. forum::für::umläute. IEM. zmoelnig@iem.at
+//    For information on usage and redistribution, and for a DISCLAIMER OF ALL
+//    WARRANTIES, see the file, "GEM.LICENSE.TERMS" in this distribution.
+//
+/////////////////////////////////////////////////////////
+
+/* this implements ImageMagick loading/saving using Magick++ */
+
+#include "imageMAGICK.h"
+#include "Gem/RTE.h"
+
+#include <Magick++.h>
+
+using namespace gem::plugins;
+
+namespace MagickCore {};
+using namespace MagickCore;
+
+namespace MagickLib  {};
+using namespace MagickLib;
+
+/////////////////////////////////////////////////////////
+// really open the file ! (OS dependent)
+//
+/////////////////////////////////////////////////////////
+bool imageMAGICK :: load(std::string filename, imageStruct&result, gem::Properties&props)
+{
+  Magick::Image image;
+  try {
+    ::verbose(2, "reading '%s' with ImageMagick", filename.c_str());
+    // Read a file into image object
+    try {
+      image.read( filename );
+    } catch (Magick::Warning e) {
+      verbose(1, "magick loading problem: %s", e.what());
+    }
+
+    result.xsize=static_cast<GLint>(image.columns());
+    result.ysize=static_cast<GLint>(image.rows());
+    result.setCsizeByFormat(GL_RGBA);
+    result.reallocate();
+
+    result.upsidedown=true;
+
+    try {
+      image.write(0,0,result.xsize,result.ysize,
+                  "RGBA",
+                  Magick::CharPixel,
+                  reinterpret_cast<void*>(result.data));
+    } catch (Magick::Warning e) {
+      verbose(1, "magick decoding problem: %s", e.what());
+    }
+  }catch( Magick::Exception e )  {
+    verbose(1, "magick loading image failed with: %s", e.what());
+    return false;
+  }
+  return true;
+}
+bool imageMAGICK::save(const imageStruct&image, const std::string&filename, const std::string&mimetype, const gem::Properties&props) {
+  imageStruct*img=const_cast<imageStruct*>(&image);
+  imageStruct*pImage=img;
+
+  std::string cs;
+  switch(img->format) {
+  case GL_LUMINANCE:
+    cs="K";
+    break;
+  case GL_RGBA:
+    cs="RGBA";
+    break;
+  default:
+    pImage=new imageStruct();
+    pImage->convertFrom(img, GL_RGB);
+  case GL_RGB:
+    cs="RGB";
+    break;
+  case GL_BGRA_EXT:
+    cs="BGRA";
+    break;
+  }
+  try{
+    Magick::Image mimage(pImage->xsize, pImage->ysize, cs, Magick::CharPixel, pImage->data);
+    // since openGL is upside down
+    if(!pImage->upsidedown) {
+      mimage.flip();
+    }
+    // 8 bits per channel are enough!
+    // LATER make this dependent on the image->type
+    mimage.depth(8);
+    double quality;
+    if(props.get("quality", quality)) {
+      mimage.quality(quality);
+    }
+
+    try {
+      // finally convert and export
+      mimage.write(filename);
+    } catch (Magick::Warning e) {
+      verbose(1, "magick saving problem: %s", e.what());
+    }
+
+  } catch (Magick::Exception e){
+    error("%s", e.what());
+    if(pImage!=&image)delete pImage; pImage=NULL;
+    return false;
+  } catch (...) {
+      error("imageMAGICK:: uncaught exception!");
+      return false;
+  }
+  if(pImage!=&image)delete pImage; pImage=NULL;
+  return true;
+}