[oe] [PATCH] Change false to FALSE and 1 to TRUE, FIX qtwebengine compile

Martin Jansa martin.jansa at gmail.com
Wed Dec 30 11:56:29 UTC 2015


On Thu, Dec 24, 2015 at 08:13:46PM -0200, Cleiton Bueno wrote:
> Signed-off-by: Cleiton Bueno <cleitonrbueno at gmail.com>

Where do you want this to be applied? If it's for qtwebengine recipe in
meta-qt5 then you should send change for meta-qt5 repo (which includes
.patch for qtwebengine), not patch for qtwebengine repo.

> ---
>  src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
> index 8a08fe0..32b2a05 100644
> --- a/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
> +++ b/src/3rdparty/chromium/ui/gfx/codec/jpeg_codec.cc
> @@ -120,7 +120,7 @@ boolean EmptyOutputBuffer(jpeg_compress_struct* cinfo) {
>    // tell libjpeg where to write the next data
>    cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
>    cinfo->dest->free_in_buffer = state->out->size() - state->image_buffer_used;
> -  return 1;
> +  return TRUE;
>  }
>  
>  // Cleans up the JpegEncoderState to prepare for returning in the final form.
> @@ -261,7 +261,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
>    cinfo.data_precision = 8;
>  
>    jpeg_set_defaults(&cinfo);
> -  jpeg_set_quality(&cinfo, quality, 1);  // quality here is 0-100
> +  jpeg_set_quality(&cinfo, quality, TRUE);  // quality here is 0-100
>  
>    // set up the destination manager
>    jpeg_destination_mgr destmgr;
> @@ -273,7 +273,7 @@ bool JPEGCodec::Encode(const unsigned char* input, ColorFormat format,
>    JpegEncoderState state(output);
>    cinfo.client_data = &state;
>  
> -  jpeg_start_compress(&cinfo, 1);
> +  jpeg_start_compress(&cinfo, TRUE);
>  
>    // feed it the rows, doing necessary conversions for the color format
>  #ifdef JCS_EXTENSIONS
> @@ -359,7 +359,7 @@ void InitSource(j_decompress_ptr cinfo) {
>  //   set to a positive value if TRUE is returned. A FALSE return should only
>  //   be used when I/O suspension is desired."
>  boolean FillInputBuffer(j_decompress_ptr cinfo) {
> -  return false;
> +  return FALSE;
>  }
>  
>  // Skip data in the buffer. Since we have all the data at once, this operation
> @@ -487,8 +487,8 @@ bool JPEGCodec::Decode(const unsigned char* input, size_t input_size,
>    cinfo.client_data = &state;
>  
>    // fill the file metadata into our buffer
> -  if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
> -    return false;
> +  if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
> +    return FALSE;
>  
>    // we want to always get RGB data out
>    switch (cinfo.jpeg_color_space) {
> -- 
> 1.8.1.2
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20151230/8c8d51e6/attachment-0002.sig>


More information about the Openembedded-devel mailing list