diff options
Diffstat (limited to 'libcore/imagemagickwrapper.c')
| -rw-r--r-- | libcore/imagemagickwrapper.c | 177 |
1 files changed, 50 insertions, 127 deletions
diff --git a/libcore/imagemagickwrapper.c b/libcore/imagemagickwrapper.c index ab1bcba..79e48e7 100644 --- a/libcore/imagemagickwrapper.c +++ b/libcore/imagemagickwrapper.c @@ -12,151 +12,74 @@ cImageMagickWrapper::~cImageMagickWrapper() { } cImage *cImageMagickWrapper::CreateImage(int width, int height, bool preserveAspect) { + if (image == NULL) return NULL; + int w, h; - w = buffer.columns(); - h = buffer.rows(); + w = cairo_image_surface_get_width(image); + h = cairo_image_surface_get_height(image); if (width == 0) width = w; if (height == 0) height = h; + + cairo_surface_t *surface; + surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); + + cairo_t *cr; + cr = cairo_create(surface); + + double sx = width / (double)w; + double sy = height / (double)h; if (preserveAspect) { - unsigned scale_w = 1000 * width / w; - unsigned scale_h = 1000 * height / h; - if (scale_w > scale_h) - width = w * height / h; - else - height = h * width / w; - } - const PixelPacket *pixels = buffer.getConstPixels(0, 0, w, h); - cImage *image = new cImage(cSize(width, height)); - tColor *imgData = (tColor *)image->Data(); - if (w != width || h != height) { - ImageScaler scaler; - scaler.SetImageParameters(imgData, width, width, height, w, h); - for (const void *pixels_end = &pixels[w*h]; pixels < pixels_end; ++pixels) - scaler.PutSourcePixel(pixels->blue / ((MaxRGB + 1) / 256), - pixels->green / ((MaxRGB + 1) / 256), - pixels->red / ((MaxRGB + 1) / 256), - ~((unsigned char)(pixels->opacity / ((MaxRGB + 1) / 256)))); - return image; + if (sx < sy) + sy = sx; + if (sy < sx) + sx = sy; } - for (const void *pixels_end = &pixels[width*height]; pixels < pixels_end; ++pixels) - *imgData++ = ((~int(pixels->opacity / ((MaxRGB + 1) / 256)) << 24) | - (int(pixels->green / ((MaxRGB + 1) / 256)) << 8) | - (int(pixels->red / ((MaxRGB + 1) / 256)) << 16) | - (int(pixels->blue / ((MaxRGB + 1) / 256)) )); - return image; -} + cairo_scale(cr, sx, sy); -cImage cImageMagickWrapper::CreateImageCopy() { - int w, h; - w = buffer.columns(); - h = buffer.rows(); - cImage image (cSize(w, h)); - const PixelPacket *pixels = buffer.getConstPixels(0, 0, w, h); - for (int iy = 0; iy < h; ++iy) { - for (int ix = 0; ix < w; ++ix) { - tColor col = (~int(pixels->opacity * 255 / MaxRGB) << 24) - | (int(pixels->green * 255 / MaxRGB) << 8) - | (int(pixels->red * 255 / MaxRGB) << 16) - | (int(pixels->blue * 255 / MaxRGB) ); - image.SetPixel(cPoint(ix, iy), col); - ++pixels; - } - } - return image; -} + cairo_set_source_surface(cr, image, 0, 0); + cairo_paint(cr); -bool cImageMagickWrapper::LoadImage(std::string FileName, std::string Path, std::string Extension) { - try { - std::stringstream sstrImgFile; - sstrImgFile << Path << FileName << "." << Extension; - std::string imgFile = sstrImgFile.str(); - if (config.debugImageLoading) - dsyslog("skindesigner: trying to load: %s", imgFile.c_str()); - buffer.read(imgFile.c_str()); - if (config.debugImageLoading) - dsyslog("skindesigner: %s sucessfully loaded", imgFile.c_str()); - } catch( Magick::Warning &warning ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Warning: %s", warning.what()); - return true; - } catch( Magick::Error &error ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Error: %s", error.what()); - return false; - } catch(...) { - if (config.debugImageLoading) - dsyslog("skindesigner: an unknown Magick error occured during image loading"); - return false; - } - return true; + cairo_status_t status = cairo_status (cr); + if (status) + dsyslog("skindesigner: Cairo CreateImage Error %s", cairo_status_to_string(status)); + + unsigned char *data = cairo_image_surface_get_data(surface); + cImage *cimage = new cImage(cSize(width, height), (tColor*)data); + + cairo_destroy(cr); + cairo_surface_destroy(image); + image = NULL; + + return cimage; } bool cImageMagickWrapper::LoadImage(const char *fullpath) { if ((fullpath == NULL) || (strlen(fullpath) < 5)) return false; - try { - if (config.debugImageLoading) - dsyslog("skindesigner: trying to load: %s", fullpath); - buffer.read(fullpath); - if (config.debugImageLoading) - dsyslog("skindesigner: %s sucessfully loaded", fullpath); - } catch( Magick::Warning &warning ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Warning: %s", warning.what()); - return true; - } catch( Magick::Error &error ) { - if (config.debugImageLoading) - dsyslog("skindesigner: Magick Error: %s", error.what()); - return false; - } catch(...) { - if (config.debugImageLoading) - dsyslog("skindesigner: an unknown Magick error occured during image loading"); - return false; - } - return true; -} -Color cImageMagickWrapper::Argb2Color(tColor col) { - tIndex alpha = (col & 0xFF000000) >> 24; - tIndex red = (col & 0x00FF0000) >> 16; - tIndex green = (col & 0x0000FF00) >> 8; - tIndex blue = (col & 0x000000FF); - Color color(MaxRGB*red/255, MaxRGB*green/255, MaxRGB*blue/255, MaxRGB*(0xFF-alpha)/255); - return color; -} + if (image != NULL) cairo_surface_destroy(image); -void cImageMagickWrapper::CreateGradient(tColor back, tColor blend, int width, int height, double wfactor, double hfactor) { - Color Back = Argb2Color(back); - Color Blend = Argb2Color(blend); - int maxw = MaxRGB * wfactor; - int maxh = MaxRGB * hfactor; - - Image imgblend(Geometry(width, height), Blend); - imgblend.modifyImage(); - imgblend.type(TrueColorMatteType); - PixelPacket *pixels = imgblend.getPixels(0, 0, width, height); - for (int x = 0; x < width; x++) { - for (int y = 0; y < height; y++) { - PixelPacket *pixel = pixels + y * width + x; - int opacity = (maxw / width * x + maxh - maxh / height * y) / 2; - pixel->opacity = (opacity <= MaxRGB) ? opacity : MaxRGB; - } - } - imgblend.syncPixels(); + if (config.debugImageLoading) + dsyslog("skindesigner: trying to load: %s", fullpath); - Image imgback(Geometry(width, height), Back); - imgback.composite(imgblend, 0, 0, OverCompositeOp); + image = cairo_image_surface_create_from_png(fullpath); - buffer = imgback; -} + if (cairo_surface_status(image)) { + if (config.debugImageLoading) + dsyslog("skindesigner: Cairo LoadImage Error: %s", cairo_status_to_string(cairo_surface_status(image))); + image = NULL; + return false; + } -void cImageMagickWrapper::CreateBackground(tColor back, tColor blend, int width, int height, bool mirror) { - CreateGradient(back, blend, width, height, 0.8, 0.8); - if (mirror) - buffer.flop(); + return true; } -void cImageMagickWrapper::CreateBackgroundReverse(tColor back, tColor blend, int width, int height) { - CreateGradient(back, blend, width, height, 1.3, 0.7); + +// Just a different way to call LoadImage. Calls the above one. +bool cImageMagickWrapper::LoadImage(std::string FileName, std::string Path, std::string Extension) { + std::stringstream sstrImgFile; + sstrImgFile << Path << FileName << "." << Extension; + std::string imgFile = sstrImgFile.str(); + return LoadImage(imgFile.c_str()); } |