diff options
| author | Andreas Schwab | 2010-08-20 14:02:43 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-08-20 14:02:43 +0200 |
| commit | 7df6150a5fb544781c340240add66951a30ecb02 (patch) | |
| tree | faf26e904cbf2e3b2bd0e2f1c13eae7676816762 /src | |
| parent | 118cf45490e054aa813300e101650021b63cbb93 (diff) | |
| download | emacs-7df6150a5fb544781c340240add66951a30ecb02.tar.gz emacs-7df6150a5fb544781c340240add66951a30ecb02.zip | |
* image.c (imagemagick_clear_image): Remove debugging output.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/image.c | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index df0b500c485..c3f250aa519 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-08-20 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * image.c (imagemagick_clear_image): Remove debugging output. | ||
| 4 | |||
| 1 | 2010-08-19 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-08-19 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * cmds.c (Vself_insert_face, Vself_insert_face_command): Remove. | 7 | * cmds.c (Vself_insert_face, Vself_insert_face_command): Remove. |
diff --git a/src/image.c b/src/image.c index e2aeae3f357..ae4bf2fd937 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -7400,7 +7400,6 @@ static void | |||
| 7400 | imagemagick_clear_image (struct frame *f, | 7400 | imagemagick_clear_image (struct frame *f, |
| 7401 | struct image *img) | 7401 | struct image *img) |
| 7402 | { | 7402 | { |
| 7403 | printf("clearing imagemagick image\n"); | ||
| 7404 | x_clear_image (f, img); | 7403 | x_clear_image (f, img); |
| 7405 | } | 7404 | } |
| 7406 | 7405 | ||
| @@ -7485,7 +7484,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7485 | image. Interface :index is same as for GIF. First we "ping" the | 7484 | image. Interface :index is same as for GIF. First we "ping" the |
| 7486 | image to see how many sub-images it contains. Pinging is faster | 7485 | image to see how many sub-images it contains. Pinging is faster |
| 7487 | than loading the image to find out things about it. */ | 7486 | than loading the image to find out things about it. */ |
| 7488 | printf("im ping file %s\n", filename); | ||
| 7489 | image = image_spec_value (img->spec, QCindex, NULL); | 7487 | image = image_spec_value (img->spec, QCindex, NULL); |
| 7490 | ino = INTEGERP (image) ? XFASTINT (image) : 0; | 7488 | ino = INTEGERP (image) ? XFASTINT (image) : 0; |
| 7491 | ping_wand=NewMagickWand(); | 7489 | ping_wand=NewMagickWand(); |
| @@ -7519,7 +7517,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7519 | 7517 | ||
| 7520 | if (filename != NULL) | 7518 | if (filename != NULL) |
| 7521 | { | 7519 | { |
| 7522 | printf("im read file %s\n", filename); | ||
| 7523 | image_info=CloneImageInfo((ImageInfo *) NULL); | 7520 | image_info=CloneImageInfo((ImageInfo *) NULL); |
| 7524 | (void) strcpy(image_info->filename, filename); | 7521 | (void) strcpy(image_info->filename, filename); |
| 7525 | image_info -> number_scenes = 1; | 7522 | image_info -> number_scenes = 1; |
| @@ -7529,7 +7526,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7529 | im_image = ReadImage (image_info, exception); | 7526 | im_image = ReadImage (image_info, exception); |
| 7530 | CatchException(exception); | 7527 | CatchException(exception); |
| 7531 | 7528 | ||
| 7532 | printf("im wand from image\n"); | ||
| 7533 | image_wand = NewMagickWandFromImage(im_image); | 7529 | image_wand = NewMagickWandFromImage(im_image); |
| 7534 | } | 7530 | } |
| 7535 | else | 7531 | else |
| @@ -7565,7 +7561,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7565 | } | 7561 | } |
| 7566 | if(desired_width != -1 && desired_height != -1) | 7562 | if(desired_width != -1 && desired_height != -1) |
| 7567 | { | 7563 | { |
| 7568 | printf("MagickScaleImage %d %d\n", desired_width, desired_height); | ||
| 7569 | status = MagickScaleImage(image_wand, desired_width, desired_height); | 7564 | status = MagickScaleImage(image_wand, desired_width, desired_height); |
| 7570 | if (status == MagickFalse) { | 7565 | if (status == MagickFalse) { |
| 7571 | image_error ("Imagemagick scale failed", Qnil, Qnil); | 7566 | image_error ("Imagemagick scale failed", Qnil, Qnil); |
| @@ -7592,7 +7587,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7592 | h=XFASTINT(XCAR(XCDR(crop))); | 7587 | h=XFASTINT(XCAR(XCDR(crop))); |
| 7593 | x=XFASTINT(XCAR(XCDR(XCDR(crop)))); | 7588 | x=XFASTINT(XCAR(XCDR(XCDR(crop)))); |
| 7594 | y=XFASTINT(XCAR(XCDR(XCDR(XCDR(crop))))); | 7589 | y=XFASTINT(XCAR(XCDR(XCDR(XCDR(crop))))); |
| 7595 | printf("MagickCropImage(image_wand, %d,%d, %d,%d)\n", w, h, x, y); | ||
| 7596 | MagickCropImage(image_wand, w,h, x,y); | 7590 | MagickCropImage(image_wand, w,h, x,y); |
| 7597 | } | 7591 | } |
| 7598 | 7592 | ||
| @@ -7609,7 +7603,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7609 | PixelSetColor (background, "#ffffff");/*TODO remove hardcode*/ | 7603 | PixelSetColor (background, "#ffffff");/*TODO remove hardcode*/ |
| 7610 | 7604 | ||
| 7611 | rotation = extract_float (value); | 7605 | rotation = extract_float (value); |
| 7612 | printf ("MagickRotateImage %f\n", rotation); | ||
| 7613 | 7606 | ||
| 7614 | status = MagickRotateImage (image_wand, background, rotation); | 7607 | status = MagickRotateImage (image_wand, background, rotation); |
| 7615 | DestroyPixelWand (background); | 7608 | DestroyPixelWand (background); |
| @@ -7691,7 +7684,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7691 | int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ | 7684 | int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ |
| 7692 | char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/ | 7685 | char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/ |
| 7693 | /* Try to create a x pixmap to hold the imagemagick pixmap. */ | 7686 | /* Try to create a x pixmap to hold the imagemagick pixmap. */ |
| 7694 | printf("imagedepth:%d exportdepth:%s\n", imagedepth, exportdepth); | ||
| 7695 | if (!x_create_x_image_and_pixmap (f, width, height, imagedepth, | 7687 | if (!x_create_x_image_and_pixmap (f, width, height, imagedepth, |
| 7696 | &ximg, &img->pixmap)){ | 7688 | &ximg, &img->pixmap)){ |
| 7697 | image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil); | 7689 | image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil); |
| @@ -7758,7 +7750,6 @@ imagemagick_load_image (/* Pointer to emacs frame structure. */ | |||
| 7758 | imagemagick_error: | 7750 | imagemagick_error: |
| 7759 | /* TODO more cleanup. */ | 7751 | /* TODO more cleanup. */ |
| 7760 | image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil); | 7752 | image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil); |
| 7761 | printf("Imagemagick error, see *Messages*\n"); | ||
| 7762 | return 0; | 7753 | return 0; |
| 7763 | } | 7754 | } |
| 7764 | 7755 | ||