diff options
| author | Juan Linietsky | 2016-01-03 17:14:28 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2016-01-03 17:14:28 -0300 |
| commit | e8fbf39f886b2b5dbf5e14f07cd1dbefe8d48bf4 (patch) | |
| tree | f767c7db6b089cdc6d4c56cce09a2c65fa68e274 /scene/resources/bit_mask.cpp | |
| parent | b988f016fd2ae1fc6fab4daa1eb580e1446dbd8d (diff) | |
| download | godot-e8fbf39f886b2b5dbf5e14f07cd1dbefe8d48bf4.tar.gz godot-e8fbf39f886b2b5dbf5e14f07cd1dbefe8d48bf4.tar.zst godot-e8fbf39f886b2b5dbf5e14f07cd1dbefe8d48bf4.zip | |
-Replaced tinyjpg for jpgd (public domain), fixes progressive encoded jpgs and speeds up. Closes #2040
-Removed support of loading BitMap as image, now it must be load as a pnm, also closes #2040
Diffstat (limited to '')
| -rw-r--r-- | scene/resources/bit_mask.cpp | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/scene/resources/bit_mask.cpp b/scene/resources/bit_mask.cpp index 7cbc14508..f5bfce3ef 100644 --- a/scene/resources/bit_mask.cpp +++ b/scene/resources/bit_mask.cpp @@ -204,57 +204,3 @@ BitMap::BitMap() { ////////////////////////////////////// - -RES ResourceFormatLoaderBitMap::load(const String &p_path, const String& p_original_path, Error *r_error) { - - if (r_error) - *r_error=ERR_FILE_CANT_OPEN; - - BitMap* ptr = memnew(BitMap); - Ref<BitMap> bitmap( ptr ); - - - Image image; - - Error err = ImageLoader::load_image(p_path,&image); - - ERR_EXPLAIN("Failed loading image for BitMap: "+p_path); - ERR_FAIL_COND_V(err, RES()); - - bitmap->create_from_image_alpha(image); - if (r_error) - *r_error=OK; - - return bitmap; - -} - -bool ResourceFormatLoaderBitMap::handles_type(const String& p_type) const { - - return (p_type=="BitMap"); -} - -void ResourceFormatLoaderBitMap::get_recognized_extensions(List<String> *p_extensions) const { - - ImageLoader::get_recognized_extensions(p_extensions); -} - -String ResourceFormatLoaderBitMap::get_resource_type(const String &p_path) const { - - List<String> extensions; - ImageLoader::get_recognized_extensions(&extensions); - String ext=p_path.extension().to_lower(); - for(List<String>::Element *E=extensions.front();E;E=E->next()) { - if (E->get()==ext) - return "BitMap"; - } - return ""; -} - - -ResourceFormatLoaderBitMap::ResourceFormatLoaderBitMap() { - - -} - - |
