aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Verona2010-08-18 11:09:46 +0200
committerJoakim Verona2010-08-18 11:09:46 +0200
commit3234a340f4be698212341eccd64a94cec66c104b (patch)
treeda2b89774743411f04dc668f3fb3ff9b6cf55f0e
parenta8101f663e6cbff953b67b8bef33bc0171818477 (diff)
downloademacs-3234a340f4be698212341eccd64a94cec66c104b.tar.gz
emacs-3234a340f4be698212341eccd64a94cec66c104b.zip
minor cleanup
-rw-r--r--src/image.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/image.c b/src/image.c
index e39c46b392a..b198e6aab00 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7542,15 +7542,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */
7542 image_error ("im read failed", Qnil, Qnil); 7542 image_error ("im read failed", Qnil, Qnil);
7543 if (status == MagickFalse) goto imagemagick_error; 7543 if (status == MagickFalse) goto imagemagick_error;
7544 7544
7545
7546 /* if(ino == 0) */
7547 /* MagickSetFirstIterator(image_wand); */
7548 /* else */
7549 /* MagickSetIteratorIndex(image_wand, ino); */
7550
7551 //MagickSetFirstIterator(image_wand);
7552
7553
7554 /* If width and/or height is set in the display spec assume we want 7545 /* If width and/or height is set in the display spec assume we want
7555 to scale to those values. if either h or w is unspecified, the 7546 to scale to those values. if either h or w is unspecified, the
7556 unspecified should be calculated from the specified to preserve 7547 unspecified should be calculated from the specified to preserve
@@ -7701,7 +7692,9 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */
7701 7692
7702 if (imagemagick_rendermethod == 1) 7693 if (imagemagick_rendermethod == 1)
7703 { 7694 {
7704 /* Try if magicexportimage is any faster than pixelpushing. */ 7695 /* Magicexportimage is normaly faster than pixelpushing. This
7696 method is also well tested. Some aspects of this method are
7697 ad-hoc and needs to be more researched. */
7705 int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ 7698 int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
7706 char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/ 7699 char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
7707 /* Try to create a x pixmap to hold the imagemagick pixmap. */ 7700 /* Try to create a x pixmap to hold the imagemagick pixmap. */