From 5567e898d1052c1e2c2d32d3c37dfd957f4dc4bd Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 29 May 2017 22:11:33 -0300 Subject: Several fixes related to PBR and Environment --- modules/jpg/image_loader_jpegd.cpp | 2 +- modules/jpg/image_loader_jpegd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/jpg') diff --git a/modules/jpg/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp index 0741dd198a..8c73b69f1b 100644 --- a/modules/jpg/image_loader_jpegd.cpp +++ b/modules/jpg/image_loader_jpegd.cpp @@ -89,7 +89,7 @@ Error jpeg_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p return OK; } -Error ImageLoaderJPG::load_image(Ref p_image, FileAccess *f) { +Error ImageLoaderJPG::load_image(Ref p_image, FileAccess *f, bool p_force_linear) { PoolVector src_image; int src_image_len = f->get_len(); diff --git a/modules/jpg/image_loader_jpegd.h b/modules/jpg/image_loader_jpegd.h index 57d7a2bb1c..aa073b493d 100644 --- a/modules/jpg/image_loader_jpegd.h +++ b/modules/jpg/image_loader_jpegd.h @@ -38,7 +38,7 @@ class ImageLoaderJPG : public ImageFormatLoader { public: - virtual Error load_image(Ref p_image, FileAccess *f); + virtual Error load_image(Ref p_image, FileAccess *f, bool p_force_linear); virtual void get_recognized_extensions(List *p_extensions) const; ImageLoaderJPG(); }; -- cgit v1.2.3