Commit c44fd653 authored by Halla Rempt's avatar Halla Rempt
Browse files

Merge branch 'master' into video-export-rebased

parents fc1d4dce 97f88c12
......@@ -25,7 +25,7 @@ Note: on all operating systems the entire procedure is done in a terminal window
3. Make sure you have a compiler:
* Linux: gcc, minimum version 4.8
* OSX: clang, you need to install xcode for this
* Windows: (http://tdm-gcc.tdragon.net/, version 5.1). MSVC cannot build G'Mic correctly. For some reason, cmake wants to use nmake even when using mingw, so copy mingw32-make.exe to nmake.exe.
* Windows: (http://tdm-gcc.tdragon.net/, version 5.1). MSVC cannot build G'Mic correctly. For some reason, cmake wants to use nmake even when using mingw, so copy mingw32-make.exe to nmake.exe. And remember to install the OpenMP plugin in tdm-gcc.
4. If you compile Qt on Windows, you will also need Python 2.7: https://www.python.org/download/releases/2.7/. Make sure to have python.exe in your path.
== Setup your environment ==
......
SET(PREFIX_ext_openexr "${EXTPREFIX}" )
SET(EXTPREFIX_openexr "${EXTPREFIX}" )
if (MSVC OR MINGW)
ExternalProject_Add( ext_openexr
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/openexr-2.2.0.tar.gz
URL_MD5 b64e931c82aa3790329c21418373db4e
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/openexr.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/patch_mingw.patch
INSTALL_DIR ${PREFIX_ext_openexr}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PREFIX_ext_openexr} -DILMBASE_PACKAGE_PREFIX=${PREFIX_ext_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
INSTALL_DIR ${EXTPREFIX_openexr}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ilmbase ext_zlib
)
else()
ExternalProject_Add(ext_openexr
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
URL http://files.kde.org/krita/build/dependencies/openexr-2.2.0.tar.gz
URL_MD5 b64e931c82aa3790329c21418373db4e
PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/openexr.diff
INSTALL_DIR ${EXTPREFIX_openexr}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_openexr} -DILMBASE_PACKAGE_PREFIX=${EXTPREFIX_openexr} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DNAMESPACE_VERSIONING=OFF
UPDATE_COMMAND ""
ALWAYS 0
DEPENDS ext_ilmbase ext_zlib
)
endif()
......@@ -160,7 +160,7 @@ KisApplication::KisApplication(const QString &key, int &argc, char **argv)
setWindowIcon(KisIconUtils::loadIcon("calligrakrita"));
if (qgetenv("KRITA_NO_STYLE_OVERRIDE").isEmpty()) {
QStringList styles = QStringList() << "breeze" << "fusion" << "plastique";
QStringList styles = QStringList() << "fusion" << "plastique";
if (!styles.contains(style()->objectName().toLower())) {
Q_FOREACH (const QString & style, styles) {
if (!setStyle(style)) {
......
......@@ -61,7 +61,7 @@ KritaThreshold::~KritaThreshold()
}
KisFilterThreshold::KisFilterThreshold()
: KisFilter(id(), categoryAdjust(), i18n("&Threshold"))
: KisFilter(id(), categoryAdjust(), i18n("&Threshold..."))
{
setColorSpaceIndependence(FULLY_INDEPENDENT);
......@@ -90,12 +90,13 @@ void KisFilterThreshold::processImpl(KisPaintDeviceSP device,
KisSequentialIterator it(device, applyRect);
int p = 0;
const int pixelSize = device->colorSpace()->pixelSize();
do {
if (device->colorSpace()->intensity8(it.oldRawData()) > threshold) {
memcpy(it.rawData(), white.data(), device->colorSpace()->pixelSize());
memcpy(it.rawData(), white.data(), pixelSize);
}
else {
memcpy(it.rawData(), black.data(), device->colorSpace()->pixelSize());
memcpy(it.rawData(), black.data(), pixelSize);
}
if (progressUpdater) progressUpdater->setValue(p++);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment