aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/images.gyp
Commit message (Collapse)AuthorAge
...
* Libraries without '-l' treated as relative paths.Gravatar bungeman@google.com2013-12-02
| | | | | | | | | | | | | | | | | | | | | The following have the same effect on Windows: 'msvs_settings': { 'VCLinkerTool': { 'AdditionalDependencies': [ 'windowscodecs.lib', ],},}, 'link_settings': {'libraries': ['-lwindowscodecs.lib',],}, But this one is different: 'link_settings': {'libraries': ['windowscodecs.lib',],}, since this last one will attempt to find the library at third_party\skia\gyp\windowscodecs.lib or a place like this, instead of looking in the library paths. This also fixes capitalization of the affected libraries. R=bsalomon@google.com Review URL: https://codereview.chromium.org/99463002 git-svn-id: http://skia.googlecode.com/svn/trunk@12434 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add SkImageGenerator InterfaceGravatar halcanary@google.com2013-11-21
| | | | | | | | | | | | | | | | | | - Add SkDiscardablePixelRef class that uses SkDiscardableMemory and a SkImageGenerator. - Add SkDecodingImageGenerator class as an example of a SkImageGenerator. - Add DecodingImageGenerator unit test. - Add SkBasicDiscardableMemory implmentation for unit tests only. R=reed@google.com, scroggo@google.com Review URL: https://codereview.chromium.org/74793011 git-svn-id: http://skia.googlecode.com/svn/trunk@12341 2bbb7eff-a529-9590-31e7-b0007b416f81
* Don't require getLength on Mac.Gravatar scroggo@google.com2013-08-28
| | | | | | | | | | | | For consistency with our other image decoders, do not depend on getLength in Mac specific decoder. BUG=skia:1570 R=djsollen@google.com Review URL: https://codereview.chromium.org/23004008 git-svn-id: http://skia.googlecode.com/svn/trunk@10990 2bbb7eff-a529-9590-31e7-b0007b416f81
* Avoid getLength in ico decoder.Gravatar scroggo@google.com2013-08-21
| | | | | | | | | | | | | | Only call getLength() if hasLength() returned true. Otherwise, copy the stream into an SkDynamicMemoryWStream and copy it into alloc'ed space. Share common code between bmp and ico. BUG=https://b.corp.google.com/issue?id=8432093 R=djsollen@google.com Review URL: https://codereview.chromium.org/23330002 git-svn-id: http://skia.googlecode.com/svn/trunk@10850 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fixes for JPEG subset decoding.Gravatar scroggo@google.com2013-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the stream passed to JPEG for subset decoding is neither deleted before it is no longer needed nor deleted an extra time. src/images/SkJpegUtility.h: src/images/SkJpegUtility.cpp: Always ref and unref the stream provided to skjpeg_source_mgr. Add some comments explaining how skjpeg_source_mgr's members handle ownership. Fix a warning comparing signed and unsigned numbers, converting to size_t which is more appropriate for measuring bytes. Remove dead code referring to fMemoryBase and fMemoryBaseSize, which are never used. src/images/SkImageDecoder_libjpeg.cpp: Call the new constructor for skjpeg_source_mgr, which no longer takes a boolean to determine ownership. include/images/SkBitmapRegionDecoder.h src/images/SkBitmapRegionDecoder.cpp: This small shim has been removed, since it is not needed to use Skia's image decoders. Its functionality will be folded into Android. Required for the merge to Android. R=djsollen@google.com Review URL: https://codereview.chromium.org/21561002 git-svn-id: http://skia.googlecode.com/svn/trunk@10483 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update freetype to version 2.5.0.1 when building it from source.Gravatar djsollen@google.com2013-07-23
| | | | | | | | R=bungeman@google.com Review URL: https://codereview.chromium.org/19625006 git-svn-id: http://skia.googlecode.com/svn/trunk@10273 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update obvious deps.Gravatar bungeman@google.com2013-07-22
| | | | | | | | | | | | | | | This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then everything in skia_lib pointing toward core as best possible, then everything outside skia_lib depending on skia_lib for things in skia_lib. This prevents double definitions where a symbol is provided by both the skia_lib shared object and and a statically linked component of skia_lib. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk@10231 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert deps changes in r10220 and r10217.Gravatar bungeman@google.com2013-07-20
| | | | | | | Need to avoid linking in .a things which are already provided by .so things. git-svn-id: http://skia.googlecode.com/svn/trunk@10222 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update obvious deps.Gravatar bungeman@google.com2013-07-19
| | | | | | | | | | | | | | | This is a step toward targets declaring their deps in a sane fashion. This change resolves cycles by forcing core to the root, then opts, ports, and utils depending on core, then everything else. We will need some other change to resolve the fact that core, opts, ports, and utils depend on each other and other targets which depend on them. Outside of these targets, things look ok. R=djsollen@google.com Review URL: https://codereview.chromium.org/19823003 git-svn-id: http://skia.googlecode.com/svn/trunk@10217 2bbb7eff-a529-9590-31e7-b0007b416f81
* remove double including of libpng decoderGravatar commit-bot@chromium.org2013-06-18
| | | | | | | | | | R=bungeman@google.com Author: zachr@google.com Review URL: https://chromiumcodereview.appspot.com/17408002 git-svn-id: http://skia.googlecode.com/svn/trunk@9666 2bbb7eff-a529-9590-31e7-b0007b416f81
* GYP Changes and Scripts for Compiling Skia for ChromeOSGravatar borenet@google.com2013-06-11
| | | | | | | | | | For now, this requires having a complete ChromeOS checkout. R=djsollen@google.com Review URL: https://codereview.chromium.org/16099011 git-svn-id: http://skia.googlecode.com/svn/trunk@9505 2bbb7eff-a529-9590-31e7-b0007b416f81
* Separate core and images project.Gravatar scroggo@google.com2013-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SkImage calls functions on SkImageDecoder and SkImageEncoder. This is desired behavior, and it is also desired to include SkImage as a part of core. In order to keep core from depending on images, update SkImageDecoder_empty.cpp to implement all of SkImageDecoder and SkImageEncoder. This file will be built by chrome (in https://codereview.chromium.org/15960015). Move force_linking from SkImageDecoder.cpp to its own file. It must be called to force linking with the image decoders if desired. Call the function in tools that need it: sk_image render_pictures render_pdfs sk_hello filter bench_pictures debugger SkImageDecoder: Derive from SkNoncopyable, instead of duplicating its hiding of constructors. skhello: Return rather than trying to write a null SkData to the stream. Revert "Hamfistedly removed core dependence on images" (commit 0f05f682a90bc125323677abf3476e1027d174f5) and "Move SkImage::encode to SkImage_Codec.cpp." (commit 83e47a954d0bf65439f3d9c0c93213063dd70da3.) These two commits were temporary fixes that this change cleans up. SkSnapshot.cpp: Check for a NULL encoder returned by SkImageEncoder::Create. BUG=https://code.google.com/p/skia/issues/detail?id=1275 R=djsollen@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/15806010 git-svn-id: http://skia.googlecode.com/svn/trunk@9364 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add a comment to the top of images.gyp.Gravatar scroggo@google.com2013-05-20
| | | | | | | | Tells vi to color it properly. Review URL: https://codereview.chromium.org/15502002 git-svn-id: http://skia.googlecode.com/svn/trunk@9203 2bbb7eff-a529-9590-31e7-b0007b416f81
* Force linking with image decoders for images project.Gravatar scroggo@google.com2013-05-01
| | | | | | | | | | | | | | | | | | | | | Previously, each tool that wanted to use image decoders but did not specifically reference them had to create a dummy function that references them in order to ensure they are not stripped by the linker. Instead of making each tool reference each image decoder, do it once in SkImageDecoder.cpp. Now each tool will have image decoders linked in, assuming it includes the images project. This fixes a bug where SKPs with encoded data could not be read by bench_ or render_pictures. R=djsollen@google.com, robertphillips@google.com Review URL: https://codereview.chromium.org/14678003 git-svn-id: http://skia.googlecode.com/svn/trunk@8941 2bbb7eff-a529-9590-31e7-b0007b416f81
* Updates to skimage tool to use it for testing.Gravatar scroggo@google.com2013-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | skimage_main.cpp: More changes in the interest of testing our decoders. force_all_opaque before writing PNG files. Test reencoding the image to its original type (if possible), and then test redecoding it (to make sure the encoding was successful). Add an option to turn off this behavior. Merge decodeFileAndWrite with decodeFile. SkImageDecoder: Add kUnknown_Type to SkImageEncoder::Types. Add a static function to get the Format of an SkStream. In getFormatName(), remove an incorrect assert. When calling the flavor of DecodeStream that returns the Format, check the stream if the decoder returns kUnknown_Format. BUG=https://code.google.com/p/skia/issues/detail?id=1241 Review URL: https://codereview.chromium.org/14363003 git-svn-id: http://skia.googlecode.com/svn/trunk@8862 2bbb7eff-a529-9590-31e7-b0007b416f81
* ARGB image encoder for checksums.Gravatar bungeman@google.com2013-04-23
| | | | | | | https://codereview.chromium.org/14267031/ git-svn-id: http://skia.googlecode.com/svn/trunk@8831 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove exclude of file which no longer exists.Gravatar bungeman@google.com2013-04-18
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@8753 2bbb7eff-a529-9590-31e7-b0007b416f81
* Updates to images project.Gravatar scroggo@google.com2013-04-17
| | | | | | | | | | | | | | | | | | | | | | Use the SkImageEncoder_Factory on all platforms. On Windows and Mac, register the platform's image encoder as an option for SkImageEncoder::Create. Also add more types that can be decoded. Update comments for SkImageDecoder to be more accurate. Add more types to SkImageEncoder::Type, and return the correct type of encoder, if it exists. Use a custom version of SkImageDecoder::Factory on Windows and Mac to check the stream for registered decoders before defaulting to the platform's version. Share code with the existing SkImageDecoder::Factory method. Preparation for testing decoders and encoders: BUG=https://code.google.com/p/skia/issues/detail?id=1241 Review URL: https://codereview.chromium.org/14298010 git-svn-id: http://skia.googlecode.com/svn/trunk@8730 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix the NaCl build.Gravatar scroggo@google.com2013-04-11
| | | | | | | | Do not attempt to build our gif files or link gif in Nacl. Review URL: https://codereview.chromium.org/14201002 git-svn-id: http://skia.googlecode.com/svn/trunk@8635 2bbb7eff-a529-9590-31e7-b0007b416f81
* Include gif image decoding in images/ on linux.Gravatar scroggo@google.com2013-04-11
| | | | | | | | | | | | | Build SkImageDecoder_libgif in images project and link against libgif on linux. Ensure that the GIF decoder is used in skimage. Requires a new dependency on libgif-dev when building on linux. Review URL: https://codereview.chromium.org/14029011 git-svn-id: http://skia.googlecode.com/svn/trunk@8627 2bbb7eff-a529-9590-31e7-b0007b416f81
* Update gyp\images.gyp for move of SkJpegUtility.h from include\images to ↵Gravatar robertphillips@google.com2013-03-22
| | | | | | src\images (in r8267) git-svn-id: http://skia.googlecode.com/svn/trunk@8341 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove SK_ENABLE_LIBPNG define as it is no longer needed by Android.Gravatar djsollen@google.com2013-03-20
| | | | | | Review URL: https://codereview.chromium.org/12958002 git-svn-id: http://skia.googlecode.com/svn/trunk@8262 2bbb7eff-a529-9590-31e7-b0007b416f81
* Upstream Android modifications to the image encoders/decoders.Gravatar commit-bot@chromium.org2013-03-14
| | | | | | | | | | | | | | This CL does not update the libjpeg as that change is large enough to warrant its own CL. Author: djsollen@google.com Reviewed By: reed@google.com,robertphillips@google.com,scroggo@google.com Review URL: https://chromiumcodereview.appspot.com/12604006 git-svn-id: http://skia.googlecode.com/svn/trunk@8155 2bbb7eff-a529-9590-31e7-b0007b416f81
* Gyp changes for NaCl debuggerGravatar borenet@google.com2013-03-07
| | | | | | Review URL: https://codereview.chromium.org/12544011 git-svn-id: http://skia.googlecode.com/svn/trunk@8015 2bbb7eff-a529-9590-31e7-b0007b416f81
* move SkFDStream out of images into coreGravatar reed@google.com2013-02-25
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@7846 2bbb7eff-a529-9590-31e7-b0007b416f81
* Create SkLazyPixelRef which performs lazy decoding.Gravatar scroggo@google.com2013-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new pixel ref behaves similarly to SkImageRef, with some key differences: It does not depend on the images project. It requires an SkImageCache, which handles allocation and caching of the pixel memory. It takes a function signature for decoding which decodes into already allocated pixel memory rather than into an SkBitmap. Add two implementations of SkImageCache: SkLruImageCache and SkAshmemImageCache. Replace SkSerializationHelpers::DecodeBitmap with SkPicture::InstallPixelRefProc, and update sites that referenced it. SkBitmapFactory now sets the pixel ref to a new object of the new class SkLazyPixelRef, provided it has an SkImageCache for caching. Provide an option to do lazy decodes in render_pictures and bench_pictures. SkPicture: Eliminate the default parameters in the constructor. If a proc for decoding bitmaps is installed, use it to decode any encoded data in subpictures. When parsing deserializing subpictures, check for success. When serializing subpictures, pass the picture's bitmap encoder to the subpicture's call to serialize. Update BitmapFactoryTest to test its new behavior. BUG=https://code.google.com/p/skia/issues/detail?id=1008 BUG=https://code.google.com/p/skia/issues/detail?id=1009 Review URL: https://codereview.appspot.com/7060052 git-svn-id: http://skia.googlecode.com/svn/trunk@7835 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix android errors when unflattening an SkImageRef_ashmem object.Gravatar djsollen@google.com2013-02-01
| | | | | | Review URL: https://codereview.appspot.com/7228071 git-svn-id: http://skia.googlecode.com/svn/trunk@7514 2bbb7eff-a529-9590-31e7-b0007b416f81
* kill unused SkFlipPixelRefGravatar reed@google.com2012-12-13
| | | | | | Review URL: https://codereview.appspot.com/6949043 git-svn-id: http://skia.googlecode.com/svn/trunk@6781 2bbb7eff-a529-9590-31e7-b0007b416f81
* Create a factory to decode an SkBitmap from an SkData.Gravatar scroggo@google.com2012-11-29
| | | | | | | | | | | | | | | | Add a test and a GM for the factory, and a PNG file for it to decode. The PNG file is copyright-free, obtained from http://openclipart.org/detail/29213/paper-plane-by-ddoo In cmykjpeg, do not attempt to decode in the constructor, since it currently crashes on Mac (if you provide the correct resource path). Even when we fix this crash there is no need to do it in the constructor, since we create all of the gms in order to get their names (to determine whether to run them). Review URL: https://codereview.appspot.com/6847122 git-svn-id: http://skia.googlecode.com/svn/trunk@6618 2bbb7eff-a529-9590-31e7-b0007b416f81
* Improve NaCl supportGravatar borenet@google.com2012-11-01
| | | | | | | | | | | | | | | | - Add nacl_make script to build Skia targets for NaCl using gyp - Add nacl_interface for command-line apps - Add nacl_sample as front-end for SampleApp - Add freetype to DEPS - Various gyp tweaks for NaCl TODO: - Implement GL interface - Implement font host - Fix plumbing so that SampleApp works properly Review URL: https://codereview.appspot.com/6671044 git-svn-id: http://skia.googlecode.com/svn/trunk@6245 2bbb7eff-a529-9590-31e7-b0007b416f81
* Build Skia as a static libraryGravatar borenet@google.com2012-10-10
| | | | | | | | | | | - Roll GYP so that we get non-thin archives on Linux - Add merge_static_libs.py - Add skia_core_lib target which builds core, ports, opts*, and utils - Replace dependencies on core/ports/opts/utils with skia_core_libs - Rename exportable libraries with "skia_" Review URL: https://codereview.appspot.com/6619049 git-svn-id: http://skia.googlecode.com/svn/trunk@5889 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add the ability to provide function pointers to SkPicture serializationGravatar scroggo@google.com2012-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and deserialization for encoding and decoding bitmaps. Remove kForceFlattenBitmapPixels_Flag, which is no longer used. When an SkOrderedReadBuffer needs to read a bitmap, if it does not have an image decoder, use a dummy bitmap. In GM, add a tolerance option for color differences, used when testing picture serialization, so it can assume two images are the same even though PNG encoding/decoding may have resulted in small differences. Create dummy implementations for SkImageDecoder and SkImageEncoder functions in SkImageDecoder_empty so that a project that does not want to include the images project it can still build. Allow ports to build without images project. In Mac's image encoder, copy 4444 to 8888 before encoding. Add SkWriter32::reservePad, to provide a pointer to write non 4 byte aligned data, padded with zeroes. In bench_ and render_ pictures, pass decode function to SkPicture creation from a stream. BUG=https://code.google.com/p/skia/issues/detail?id=842 Review URL: https://codereview.appspot.com/6551071 git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
* update gyp files to build on iOSGravatar caryclark@google.com2012-09-18
| | | | | | | | | | Note that there's a hack in SkImageDecoder_CG.cpp -- the necessary defines are included directly. This is temporary until I can figure out how to include them properly. Review URL: https://codereview.appspot.com/6523044 git-svn-id: http://skia.googlecode.com/svn/trunk@5586 2bbb7eff-a529-9590-31e7-b0007b416f81
* Set bench/gm/tests as explicit dependencies of SkiaAndroidApp (trunk)Gravatar borenet@google.com2012-08-09
| | | | | | | Hopefully this fixes the flaky Android build. Review URL: https://codereview.appspot.com/6461067 git-svn-id: http://skia.googlecode.com/svn/trunk@5032 2bbb7eff-a529-9590-31e7-b0007b416f81
* Redelivering r3611 changes (enabling cmyk jpeg changes in .gyps)Gravatar robertphillips@google.com2012-04-05
| | | | | | | | | http://codereview.appspot.com/5967047/ git-svn-id: http://skia.googlecode.com/svn/trunk@3617 2bbb7eff-a529-9590-31e7-b0007b416f81
* Rolling back r3611 until the Android compilation issue is resolvedGravatar robertphillips@google.com2012-04-05
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@3613 2bbb7eff-a529-9590-31e7-b0007b416f81
* Finally enabled libjpeg functionality in .gypsGravatar robertphillips@google.com2012-04-05
| | | | | | | | http://codereview.appspot.com/5967047/ git-svn-id: http://skia.googlecode.com/svn/trunk@3611 2bbb7eff-a529-9590-31e7-b0007b416f81
* Revert 3538.Gravatar bungeman@google.com2012-03-29
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@3539 2bbb7eff-a529-9590-31e7-b0007b416f81
* Correct dependencies in gyp files.Gravatar bungeman@google.com2012-03-29
| | | | | | | http://codereview.appspot.com/5934044/ git-svn-id: http://skia.googlecode.com/svn/trunk@3538 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove unused classes from the build.Gravatar djsollen@google.com2012-03-28
| | | | | | Review URL: https://codereview.appspot.com/5938053 git-svn-id: http://skia.googlecode.com/svn/trunk@3529 2bbb7eff-a529-9590-31e7-b0007b416f81
* Copy libjpeg.gyp from third_party/externals/libjpeg/ to gyp/Gravatar epoger@google.com2012-03-26
| | | | | | | This should get our use of libjpeg-from-source unblocked; see http://code.google.com/p/skia/issues/detail?id=543 ('wrap libjpeg.gyp from Chrome's libjpeg port, rather than making our own copy') for a better long-term solution. Review URL: https://codereview.appspot.com/5908058 git-svn-id: http://skia.googlecode.com/svn/trunk@3496 2bbb7eff-a529-9590-31e7-b0007b416f81
* reverting to 3437Gravatar robertphillips@google.com2012-03-20
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
* Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on ↵Gravatar robertphillips@google.com2012-03-20
| | | | | | | | | | android) http://codereview.appspot.com/5785054/ git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
* Make all gyp targets automatically include common.gypiGravatar epoger@google.com2012-03-16
| | | | | | | Do this, rather than including common.gypi explicitly in all our gyp files, so that gyp files we use but do not maintain (e.g., third_party/externals/libjpeg/libjpeg.gyp) will include common.gypi too. Review URL: https://codereview.appspot.com/5820068 git-svn-id: http://skia.googlecode.com/svn/trunk@3411 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove libjpeg image decoder, since we've never built it since we changedGravatar tomhudson@google.com2012-03-02
| | | | | | | | | | to gyp. http://codereview.appspot.com/5722046/ git-svn-id: http://skia.googlecode.com/svn/trunk@3302 2bbb7eff-a529-9590-31e7-b0007b416f81
* Remove referenecs to nonexistent file SkImageDecoder_libpvjpeg.c from gypGravatar tomhudson@google.com2012-02-28
| | | | | | | | http://codereview.appspot.com/5707046/ git-svn-id: http://skia.googlecode.com/svn/trunk@3275 2bbb7eff-a529-9590-31e7-b0007b416f81
* Enable Android GM to produce PNG images.Gravatar djsollen@google.com2012-02-24
| | | | git-svn-id: http://skia.googlecode.com/svn/trunk@3253 2bbb7eff-a529-9590-31e7-b0007b416f81
* Add windowscodecs.lib to images.gypGravatar bsalomon@google.com2011-11-21
| | | | | | | Review URL: http://codereview.appspot.com/5422046/ git-svn-id: http://skia.googlecode.com/svn/trunk@2728 2bbb7eff-a529-9590-31e7-b0007b416f81
* Adding support to trunk for building Skia using the Android NDK.Gravatar djsollen@google.com2011-11-03
| | | | | | | | | | This CL depends on a subsequent CL to add the appropriate NDK toolchain and system sources to the skia repo. Review URL: http://codereview.appspot.com/5306089/ Review URL: http://codereview.appspot.com/5306089 git-svn-id: http://skia.googlecode.com/svn/trunk@2592 2bbb7eff-a529-9590-31e7-b0007b416f81
* Create new 'skia_os' variable to replace use of 'OS' in most places.Gravatar epoger@google.com2011-07-01
| | | | | | | | http://codereview.appspot.com/4627085 git-svn-id: http://skia.googlecode.com/svn/trunk@1782 2bbb7eff-a529-9590-31e7-b0007b416f81
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 23:28:20 +0000