Skip to content

fix: remove currently broken sdl_image layer #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jaromil wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −22
Draft

fix: remove currently broken sdl_image layer #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ PKG_CHECK_MODULES([SDLIMAGE], [SDL_image],
[have_sdlimage=yes],
[have_sdlimage=no])
if test x$have_sdlimage = xyes; then
SDLIMAGE_CFLAGS="$SDL_CFLAGS"
SDLIMAGE_CFLAGS="$SDL_CFLAGS -I/usr/include/SDL"
SDLIMAGE_LIBS="$SDL_LIBS -lSDL_image -ljpeg"
FREEJ_SAVE_FLAGS
CFLAGS="$SDLIMAGE_CFLAGS"
Expand Down
6 changes: 4 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ SOURCES = \
\
tvfreq.c unicap_layer.cpp \
v4l2_layer.cpp \
image_layer.cpp \
text_layer.cpp generator_layer.cpp \
geo_layer.cpp flash_layer.cpp \
xscreensaver_layer.cpp \
Expand All @@ -49,6 +48,10 @@ SOURCES = \
theorautils.cpp oggtheora_encoder.cpp \
impl_video_encoders.cpp

# image_layer.cpp

# image_layer_js.cpp

JS_SOURCES = context_js.cpp \
parameter_js.cpp \
layer_js.cpp \
Expand All @@ -57,7 +60,6 @@ JS_SOURCES = context_js.cpp \
callbacks_js.cpp \
video_encoder_js.cpp \
cam_layer_js.cpp \
image_layer_js.cpp \
text_layer_js.cpp \
geo_layer_js.cpp \
generator_layer_js.cpp \
Expand Down
24 changes: 12 additions & 12 deletions src/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,18 +646,18 @@ Layer *Context::open(char *file, int w, int h) {
error("VIDEO and AVI layer support not compiled");
act("can't load %s",file_ptr);
#endif
} else /* IMAGE LAYER */
if( (IS_IMAGE_EXTENSION(end_file_ptr))) {
// strncasecmp((end_file_ptr-4),".png",4)==0)
nlayer = new ImageLayer();
if(!nlayer->init()) {
error("failed initialization of layer %s for %s", nlayer->name, file_ptr);
delete nlayer; return NULL;
}
if(!nlayer->open(file_ptr)) {
error("create_layer : IMG open failed");
delete nlayer; nlayer = NULL;
}
// } else /* IMAGE LAYER */
// if( (IS_IMAGE_EXTENSION(end_file_ptr))) {
// // strncasecmp((end_file_ptr-4),".png",4)==0)
// nlayer = new ImageLayer();
// if(!nlayer->init()) {
// error("failed initialization of layer %s for %s", nlayer->name, file_ptr);
// delete nlayer; return NULL;
// }
// if(!nlayer->open(file_ptr)) {
// error("create_layer : IMG open failed");
// delete nlayer; nlayer = NULL;
// }
} else /* TXT LAYER */
if(strncasecmp((end_file_ptr-4),".txt",4)==0) {
#if defined WITH_TEXTLAYER
Expand Down
2 changes: 1 addition & 1 deletion src/include/impl_layers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/* software layers which don't need special loaders */
#include <generator_layer.h>
#include <geo_layer.h>
#include <image_layer.h> // statically included sdl_image
// #include <image_layer.h> // statically included sdl_image

#include <goom_layer.h>

Expand Down
12 changes: 6 additions & 6 deletions src/jsparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,12 @@ void JsExecutionContext::init_class() {
generator_layer_methods,
object_proto);

REGISTER_CLASS("ImageLayer",
image_layer_class,
image_layer_constructor,
NULL,
image_layer_methods,
object_proto);
// REGISTER_CLASS("ImageLayer",
// image_layer_class,
// image_layer_constructor,
// NULL,
// image_layer_methods,
// object_proto);

#ifdef WITH_FLASH
REGISTER_CLASS("FlashLayer",
Expand Down