Changeset 102750 in webkit


Ignore:
Timestamp:
Dec 14, 2011 1:12:08 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[BlackBerry] Switch to libjpeg for decoding
​https://bugs.webkit.org/show_bug.cgi?id=74475

Patch by Jacky Jiang <​zhajiang@rim.com> on 2011-12-14
Reviewed by Daniel Bates.

.:

Find libjpeg instead of libimg.

  • Source/cmake/OptionsBlackBerry.cmake:

Source/WebCore:

Switch to cross platform JPEG image decoder for decoding as this keeps
us inline with other ports and less to maintain.

  • PlatformBlackBerry.cmake:

Source/WebKit:

Append libjpeg instead of libimg.

  • blackberry/CMakeListsBlackBerry.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r102679 r102750  
     12011-12-14  Jacky Jiang  <zhajiang@rim.com>
     2
     3        [BlackBerry] Switch to libjpeg for decoding
     4        https://bugs.webkit.org/show_bug.cgi?id=74475
     5
     6        Reviewed by Daniel Bates.
     7
     8        Find libjpeg instead of libimg.
     9
     10        * Source/cmake/OptionsBlackBerry.cmake:
     11
    1122011-12-13  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    213

  • trunk/Source/WebCore/ChangeLog

    r102748 r102750  
     12011-12-14  Jacky Jiang  <zhajiang@rim.com>
     2
     3        [BlackBerry] Switch to libjpeg for decoding
     4        https://bugs.webkit.org/show_bug.cgi?id=74475
     5
     6        Reviewed by Daniel Bates.
     7
     8        Switch to cross platform JPEG image decoder for decoding as this keeps
     9        us inline with other ports and less to maintain.
     10
     11        * PlatformBlackBerry.cmake:
     12
    1132011-12-03  Philippe Normand  <pnormand@igalia.com>
    214

  • trunk/Source/WebCore/PlatformBlackBerry.cmake

    r102744 r102750  
    6868    platform/graphics/opentype/OpenTypeSanitizer.cpp
    6969    platform/image-decoders/ImageDecoder.cpp
    70     platform/image-decoders/blackberry/JPEGImageDecoder.cpp
    7170    platform/image-decoders/bmp/BMPImageDecoder.cpp
    7271    platform/image-decoders/bmp/BMPImageReader.cpp
    … …  
    7473    platform/image-decoders/gif/GIFImageReader.cpp
    7574    platform/image-decoders/ico/ICOImageDecoder.cpp
     75    platform/image-decoders/jpeg/JPEGImageDecoder.cpp
    7676    platform/image-decoders/png/PNGImageDecoder.cpp
    7777    platform/image-decoders/webp/WEBPImageDecoder.cpp
    … …  
    172172    platform/graphics/blackberry/MediaPlayerPrivateMMrenderer.cpp
    173173    platform/graphics/blackberry/ResourceBlackBerry.cpp
    174     platform/image-decoders/blackberry/JPEGImageDecoder.cpp
    175174    platform/image-decoders/bmp/BMPImageDecoder.cpp
    176175    platform/image-decoders/gif/GIFImageDecoder.cpp

  • trunk/Source/WebKit/ChangeLog

    r102747 r102750  
     12011-12-14  Jacky Jiang  <zhajiang@rim.com>
     2
     3        [BlackBerry] Switch to libjpeg for decoding
     4        https://bugs.webkit.org/show_bug.cgi?id=74475
     5
     6        Reviewed by Daniel Bates.
     7
     8        Append libjpeg instead of libimg.
     9
     10        * blackberry/CMakeListsBlackBerry.txt:
     11
    1122011-12-14  Jacky Jiang  <zhajiang@rim.com>
    213

  • trunk/Source/WebKit/blackberry/CMakeListsBlackBerry.txt

    r102207 r102750  
    116116    ${ICUI18N_LIBRARY}
    117117    ${ICUUC_LIBRARY}
    118     ${IMG_LIBRARY}
    119118    ${INTL_LIBRARY}
    120119    ${Iconv_LIBRARY}
     120    ${JPEG_LIBRARY}
    121121    ${JavaScriptCore_LIBRARY_NAME}
    122122    ${MD_LIBRARY}

  • trunk/Source/cmake/OptionsBlackBerry.cmake

    r101685 r102750  
    5252FIND_STAGING_LIBRARY(Skia_LIBRARY grskia)
    5353FIND_STAGING_LIBRARY(Skia_QNX_LIBRARY skia-qnx)
    54 FIND_STAGING_LIBRARY(IMG_LIBRARY img)
     54FIND_STAGING_LIBRARY(JPEG_LIBRARY jpeg)
    5555FIND_STAGING_LIBRARY(PNG_LIBRARY png)
    5656FIND_STAGING_LIBRARY(XML2_LIBRARY xml2)
Note: See TracChangeset for help on using the changeset viewer.