Don't use unsafe strcpy() when parsing wxNativeFontInfo.

[wxWidgets.git] / src / jpeg / jdcoefct.c

diff --git a/src/jpeg/jdcoefct.c b/src/jpeg/jdcoefct.c
index 5b5b3bbd496ea7c860315713d0481410ff4f6066..e5c3636e46dee1c04a9b556d50cfbc41747a10ac 100644 (file)
--- a/src/jpeg/jdcoefct.c
+++ b/src/jpeg/jdcoefct.c
@@ -69,7 +69,7 @@ METHODDEF(int) decompress_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 #ifdef BLOCK_SMOOTHING_SUPPORTED

-LOCAL(boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
+LOCAL(wxjpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));

 METHODDEF(int) decompress_smooth_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif
 METHODDEF(int) decompress_smooth_data
        JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
 #endif


@@ -404,11 +404,11 @@ decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
  * more accurately than they really are.
  */
 
  * more accurately than they really are.
  */
 

-LOCAL(boolean)
+LOCAL(wxjpeg_boolean)

 smoothing_ok (j_decompress_ptr cinfo)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
 smoothing_ok (j_decompress_ptr cinfo)
 {
   my_coef_ptr coef = (my_coef_ptr) cinfo->coef;

-  boolean smoothing_useful = FALSE;
+  wxjpeg_boolean smoothing_useful = FALSE;

   int ci, coefi;
   jpeg_component_info *compptr;
   JQUANT_TBL * qtable;
   int ci, coefi;
   jpeg_component_info *compptr;
   JQUANT_TBL * qtable;


@@ -473,7 +473,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
   JDIMENSION output_col;
   jpeg_component_info *compptr;
   inverse_DCT_method_ptr inverse_DCT;
   JDIMENSION output_col;
   jpeg_component_info *compptr;
   inverse_DCT_method_ptr inverse_DCT;

-  boolean first_row, last_row;
+  wxjpeg_boolean first_row, last_row;

   JBLOCK workspace;
   int *coef_bits;
   JQUANT_TBL *quanttbl;
   JBLOCK workspace;
   int *coef_bits;
   JQUANT_TBL *quanttbl;


@@ -676,7 +676,7 @@ decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
  */
 
 GLOBAL(void)
  */
 
 GLOBAL(void)

-jinit_d_coef_controller (j_decompress_ptr cinfo, boolean need_full_buffer)
+jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)

 {
   my_coef_ptr coef;
 
 {
   my_coef_ptr coef;