(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 7307248694ceffc68a0eed2e2e89c2a1c1b5238e..d8cd320d6f67cb25571bbedeca2a6bb64e6e1a41 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1932,6 +1932,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       if (image->units == PixelsPerCentimeterResolution)
         jpeg_info.density_unit=(UINT8) 2;
     }
+  jpeg_info.dct_method=JDCT_FLOAT;
   option=GetImageOption(image_info,"jpeg:dct-method");
   if (option != (const char *) NULL)
     switch (*option)
@@ -2153,8 +2154,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       jpeg_info.comp_info[i].h_samp_factor=1;
       jpeg_info.comp_info[i].v_samp_factor=1;
     }
-  if ((jpeg_info.comp_info[0].h_samp_factor >= 2) &&
-      (jpeg_info.comp_info[0].v_samp_factor >= 2))
+  if ((jpeg_info.comp_info[0].h_samp_factor >= 1) &&
+      (jpeg_info.comp_info[0].v_samp_factor >= 1))
     {
       /*
         Nicolas Robidoux's remix of ISO-IEC 10918-1 : 1993(E) Annex K.