Changeset 1395:a5f10bd71d84

Timestamp:

11/05/09 18:29:39 (2 years ago)

Author:

niam

Branch:

default

Message:

graphics::image: specify encoder on write

Location:

src

Files:

• examples/image/test.cc (modified) (7 diffs)
• include/libdodo/graphicsImage.h (modified) (2 diffs)
• include/libdodo/graphicsImageEx.h (modified) (1 diff)
• src/graphicsImage.cc (modified) (4 diffs)

src/examples/image/test.cc

@@ -63 +63 @@
         draw::circle(im, point(300, 300), 50, color::blue, color::white, 5);
 
-        im.write(file::regular("test-0.jpg", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("test-0.jpg", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_JPEG);
 
 #ifndef GRAPHICS_WO_XEXEC
@@ -71 +71 @@
 
         dodoString img;
-        im.setEncoder(image::ENCODER_PNG);
         im.setCompression(image::COMPRESSION_ZIP);
         im.setQuality(4);
         im.setColorSpecification(image::COLOR_SPECIFICATION_GRAYSCALE);
-        im.write(file::regular("test-1.jpg", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("test-1.jpg", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_JPEG);
 
         im.create(400, 400);
@@ -81 +80 @@
         draw::circle(im, point(200, 200), 50, color::blue, color::white, 5);
         draw::rectangle(im, point(200, 200), point(300, 300), color::green, color::red, 15);
-        im.write(file::regular("new-0.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-0.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 
         im.read(file::regular("new-0.png", file::regular::OPEN_MODE_READ_ONLY));
         im.removeAlpha();
-        im.write(file::regular("new-1.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-1.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 
         im.read(file::regular("new-1.png", file::regular::OPEN_MODE_READ_ONLY));
@@ -96 +95 @@
         green.opacity = 65535 / 2;
         draw::circle(im, point(250, 250), 50, green, color::white, 5);
-        im.write(file::regular("new-2.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-2.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 
         im.create(400, 400);
@@ -108 +107 @@
         for (int i = 0; i < 360; ++i)
             draw::point(im, point((unsigned long)(cos(i) * 100 + 150), (unsigned long)(200 - sin(i) * 100)), color::black);
-        im.write(file::regular("new-3.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-3.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 
         im.create(400, 400);
@@ -116 +115 @@
         draw::text(im, point(150, 150), "libdodo", "Arial", 50, color::blue, color::green, 2, 180);
         draw::text(im, point(150, 200), "libdodo", "Arial", 50, color::blue, color::green, 2, 90);
-        im.write(file::regular("new-4.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-4.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 
         image wm;
@@ -124 +123 @@
         draw::image(im, point(100, 100), wm, 45);
         im.setOpacity(65535 / 2);
-        im.write(file::regular("new-5.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE));
+        im.write(file::regular("new-5.png", file::regular::OPEN_MODE_READ_WRITE_TRUNCATE), image::ENCODER_PNG);
 #endif
     } catch (dodo::exception::basic &ex)   {

src/include/libdodo/graphicsImage.h

@@ -215 +215 @@
              * write image
              * @param img defines source for writing image
-             */
-            void write(const io::channel &img);
+             * @param encoder defines type of image encoder, @see image::encoderEnum
+             */
+            void write(const io::channel &img,
+                       short encoder);
 
             /**
@@ -256 +258 @@
              */
             void setBackgroundColor(__color__ background);
-
-            /**
-             * set image output encoder
-             * @param encoder defines image encoder, @see image::encoderEnum
-             */
-            void setEncoder(short encoder);
 
             /**

src/include/libdodo/graphicsImageEx.h

@@ -64 +64 @@
             IMAGEEX_CREATE,
             IMAGEEX_WRITE,
-            IMAGEEX_SETENCODER,
+            IMAGEEX_SETCOMPRESSION,
             IMAGEEX_SETTYPE,
             IMAGEEX_SETALPHA,

src/src/graphicsImage.cc

@@ -415 +415 @@
 
 void
-image::write(const io::channel &img)
+image::write(const io::channel &img,
+             short encoder)
 {
 #ifndef GRAPHICS_WO_XEXEC
@@ -425 +426 @@
 
     GetExceptionInfo((ExceptionInfo *)exInfo);
+
+    if (encoder < 0 || encoder >= ENCODER_ENUMSIZE)
+        throw exception::basic(exception::MODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_LIBDODO, IMAGEEX_BADINFO, GRAPHICSIMAGEEX_BADINFO_STR, __LINE__, __FILE__);
+
+    strcpy(collectedData.handle->imInfo->magick, encoderStatements[encoder]);
 
     size_t size = 0;
@@ -445 +451 @@
 {
     if (type < 0 || type >= COMPRESSION_ENUMSIZE)
-        throw exception::basic(exception::MODULE_GRAPHICSIMAGE, IMAGEEX_SETENCODER, exception::ERRNO_LIBDODO, IMAGEEX_BADINFO, GRAPHICSIMAGEEX_BADINFO_STR, __LINE__, __FILE__);
+        throw exception::basic(exception::MODULE_GRAPHICSIMAGE, IMAGEEX_SETCOMPRESSION, exception::ERRNO_LIBDODO, IMAGEEX_BADINFO, GRAPHICSIMAGEEX_BADINFO_STR, __LINE__, __FILE__);
 
     collectedData.handle->imInfo->compression = (CompressionType)compressionStatements[type];
@@ -456 +462 @@
 {
     collectedData.handle->imInfo->quality = quality;
-}
-
-//-------------------------------------------------------------------
-
-void
-image::setEncoder(short encoder)
-{
-    if (encoder < 0 || encoder >= ENCODER_ENUMSIZE)
-        throw exception::basic(exception::MODULE_GRAPHICSIMAGE, IMAGEEX_SETENCODER, exception::ERRNO_LIBDODO, IMAGEEX_BADINFO, GRAPHICSIMAGEEX_BADINFO_STR, __LINE__, __FILE__);
-
-    strcpy(collectedData.handle->imInfo->magick, encoderStatements[encoder]);
 }