Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 19734 → Rev 19735

/trunk/Scribus/CMakeLists.txt
771,7 → 771,8
#<<GraphicksMagick for image import
IF (WANT_GRAPHICSMAGICK)
SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
FIND_PACKAGE(GMAGICK)
pkg_check_modules(GMAGICK GraphicsMagick)
# FIND_PACKAGE(GMAGICK)
IF(GMAGICK_FOUND)
MESSAGE("GraphicksMagick Found OK")
ELSE(GMAGICK_FOUND)
/trunk/Scribus/scribus/CMakeLists.txt
1067,9 → 1067,9
)
 
IF (GMAGICK_FOUND)
MESSAGE(STATUS "GMAGICK: Libs: ${GMAGICK_LIBRARIES}, Inc: ${GMAGICK_INCLUDES}, Ldflags: ${GMAGICK_LDFLAGS}")
MESSAGE(STATUS "GMAGICK: Libs: ${GMAGICK_LDFLAGS}, Inc: ${GMAGICK_INCLUDE_DIRS}, Ldflags: ${GMAGICK_LDFLAGS}")
INCLUDE_DIRECTORIES(
BEFORE ${GMAGICK_INCLUDES}
BEFORE ${GMAGICK_INCLUDE_DIRS}
)
LINK_DIRECTORIES(
${GMAGICK_LDFLAGS} #TODO
/trunk/Scribus/scribus/scimgdataloader_gmagick.cpp
162,7 → 162,7
qCritical() << "Failed to read image" << fn;
return false;
}
 
image = FlattenImages(image, &exception);
// qDebug() << "has matte(alpha):" << image->matte;
int width = image->columns;
int height = image->rows;