mirror of
https://invent.kde.org/frameworks/kimageformats.git
synced 2025-07-16 03:24:17 -04:00
Compare commits
14 Commits
v4.99.0-rc
...
v5.3.0
Author | SHA1 | Date | |
---|---|---|---|
5ae66b99d9 | |||
f4bea644eb | |||
415850f3d3 | |||
af19f49711 | |||
3d45b270ea | |||
c9ca1f1862 | |||
a96a255f71 | |||
5b42b3b787 | |||
f98e508da4 | |||
a92540f00d | |||
2ec0d5abc6 | |||
cca4c545a4 | |||
87b545f9ed | |||
1132abbf67 |
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
|
||||
|
||||
project(KImageFormats)
|
||||
|
||||
find_package(ECM 0.0.13 REQUIRED NO_MODULE)
|
||||
find_package(ECM 1.3.0 REQUIRED NO_MODULE)
|
||||
|
||||
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
|
||||
|
||||
@ -30,13 +30,17 @@ if (UNIX)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
find_package(Jasper)
|
||||
set_package_properties(Jasper PROPERTIES
|
||||
DESCRIPTION "A library for handling JPEG-2000 images"
|
||||
PURPOSE "Required for the QImage plugin for JPEG-2000 images"
|
||||
URL "http://www.ece.uvic.ca/~mdadams/jasper"
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
# QtImageFormats 5.3 comes with a JPEG-2000 plugin; don't duplicate it here
|
||||
# TODO: remove our JPEG-2000 plugin when we depend on Qt 5.3.
|
||||
if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
|
||||
find_package(Jasper)
|
||||
set_package_properties(Jasper PROPERTIES
|
||||
DESCRIPTION "A library for handling JPEG-2000 images"
|
||||
PURPOSE "Required for the QImage plugin for JPEG-2000 images"
|
||||
URL "http://www.ece.uvic.ca/~mdadams/jasper"
|
||||
TYPE OPTIONAL
|
||||
)
|
||||
endif()
|
||||
|
||||
find_package(OpenEXR)
|
||||
set_package_properties(OpenEXR PROPERTIES
|
||||
|
@ -1,6 +1,6 @@
|
||||
# KImageFormats
|
||||
|
||||
Image format plugins for Qt
|
||||
Plugins to allow QImage to support extra file formats.
|
||||
|
||||
## Introduction
|
||||
|
||||
@ -63,9 +63,3 @@ This framework is licensed under the
|
||||
The CMake code in this framework is licensed under the
|
||||
[BSD license](http://opensource.org/licenses/BSD-3-Clause).
|
||||
|
||||
## Links
|
||||
|
||||
- Home page: <https://projects.kde.org/projects/frameworks/kimageformats>
|
||||
- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-frameworks-devel>
|
||||
- IRC channel: \#kde-devel on Freenode
|
||||
- Git repository: <https://projects.kde.org/projects/frameworks/kimageformats/repository>
|
||||
|
@ -1,9 +1,12 @@
|
||||
maintainer: alexmerry
|
||||
description: Addons to QtImageFormats
|
||||
description: Image format plugins for Qt
|
||||
tier: 1
|
||||
type: functional
|
||||
platforms:
|
||||
- name: All
|
||||
- name: Linux
|
||||
- name: MacOSX
|
||||
- name: Windows
|
||||
note: No EPS support on Windows
|
||||
portingAid: false
|
||||
deprecated: false
|
||||
release: true
|
||||
|
@ -2,11 +2,15 @@
|
||||
|
||||
##################################
|
||||
|
||||
add_library(kimg_dds MODULE dds.cpp)
|
||||
target_link_libraries(kimg_dds Qt5::Gui)
|
||||
if (Qt5Gui_VERSION VERSION_LESS 5.3.0)
|
||||
add_library(kimg_dds MODULE dds.cpp)
|
||||
target_link_libraries(kimg_dds Qt5::Gui)
|
||||
|
||||
install(TARGETS kimg_dds DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
|
||||
install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
|
||||
install(TARGETS kimg_dds DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
|
||||
install(FILES dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
|
||||
else()
|
||||
install(FILES dds-qt.desktop RENAME dds.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
|
||||
endif()
|
||||
|
||||
##################################
|
||||
|
||||
@ -34,6 +38,9 @@ if(JASPER_FOUND)
|
||||
|
||||
install(TARGETS kimg_jp2 DESTINATION ${QT_PLUGIN_INSTALL_DIR}/imageformats/)
|
||||
install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
|
||||
elseif (NOT Qt5Gui_VERSION VERSION_LESS 5.3.0)
|
||||
# need this for Qt's version of the plugin
|
||||
install(FILES jp2.desktop DESTINATION ${SERVICES_INSTALL_DIR}/qimageioplugins/)
|
||||
endif()
|
||||
|
||||
##################################
|
||||
|
7
src/imageformats/dds-qt.desktop
Normal file
7
src/imageformats/dds-qt.desktop
Normal file
@ -0,0 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Type=Service
|
||||
X-KDE-ServiceTypes=QImageIOPlugins
|
||||
X-KDE-ImageFormat=dds
|
||||
X-KDE-MimeType=image/x-dds
|
||||
X-KDE-Read=true
|
||||
X-KDE-Write=true
|
@ -19,7 +19,7 @@
|
||||
* rgb dds files only -- TODO
|
||||
*/
|
||||
|
||||
#include "dds.h"
|
||||
#include "dds_p.h"
|
||||
|
||||
#include <QtCore/QStringList>
|
||||
#include <QImage>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* QImageIO Routines to read/write EPS images.
|
||||
* copyright (c) 1998 Dirk Schoenberger <dirk.schoenberger@freenet.de>
|
||||
* Copyright (c) 2013 Alex Merry <alex.merry@kdemail.net>
|
||||
@ -6,7 +6,7 @@
|
||||
*
|
||||
* This library is distributed under the conditions of the GNU LGPL.
|
||||
*/
|
||||
#include "eps.h"
|
||||
#include "eps_p.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QImage>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* QImageIO Routines to read/write EPS images.
|
||||
* copyright (c) 1998 Dirk Schoenberger <dirk.schoenberger@freenet.de>
|
||||
*
|
@ -1,5 +1,5 @@
|
||||
|
||||
/**
|
||||
/*
|
||||
* KImageIO Routines to read (and perhaps in the future, write) images
|
||||
* in the high dynamic range EXR format.
|
||||
* Copyright (c) 2003, Brad Hards <bradh@frogmouth.net>
|
||||
@ -7,7 +7,7 @@
|
||||
* This library is distributed under the conditions of the GNU LGPL.
|
||||
*/
|
||||
|
||||
#include "exr.h"
|
||||
#include "exr_p.h"
|
||||
|
||||
#include <ImfRgbaFile.h>
|
||||
#include <ImfStandardAttributes.h>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* QImageIO Routines to read (and perhaps in the future, write) images
|
||||
* in the high definition EXR format.
|
||||
*
|
@ -8,7 +8,7 @@
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "hdr.h"
|
||||
#include "hdr_p.h"
|
||||
|
||||
#include <QImage>
|
||||
#include <QtCore/QDataStream>
|
||||
|
@ -1,11 +1,11 @@
|
||||
/**
|
||||
/*
|
||||
* QImageIO Routines to read/write JPEG2000 images.
|
||||
* copyright (c) 2002 Michael Ritzert <michael@ritzert.de>
|
||||
*
|
||||
* This library is distributed under the conditions of the GNU LGPL.
|
||||
*/
|
||||
|
||||
#include "jp2.h"
|
||||
#include "jp2_p.h"
|
||||
|
||||
#include <config-jp2.h>
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* QImageIO Routines to read/write JPEG2000 images.
|
||||
* copyright (c) 2002 Michael Ritzert <michael@ritzert.de>
|
||||
*
|
@ -7,7 +7,7 @@
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "pcx.h"
|
||||
#include "pcx_p.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QDataStream>
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* Softimage PIC support for QImage
|
||||
* Copyright 1998 Halfdan Ingvarsson
|
||||
* Copyright 2007 Ruben Lopez <r.lopez@bren.es>
|
||||
@ -25,7 +25,7 @@
|
||||
* with his permission.
|
||||
*/
|
||||
|
||||
#include "pic.h"
|
||||
#include "pic_p.h"
|
||||
|
||||
#include <QDataStream>
|
||||
#include <QDebug>
|
||||
@ -340,7 +340,7 @@ static void encodeMixedRLEData(QDataStream &stream, const Item *data, unsigned l
|
||||
chunkLength = 1;
|
||||
chunkEnd = chunkStart + 1;
|
||||
while (chunkLength < maxChunk &&
|
||||
(chunkLength + 1 == maxChunk ||
|
||||
(chunkLength + 1u == maxChunk ||
|
||||
!itemsEqual(*chunkEnd, *(chunkEnd+1))))
|
||||
{
|
||||
++chunkEnd;
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/*
|
||||
* PIC_RW - Qt PIC Support
|
||||
* Copyright (C) 2007 Ruben Lopez <r.lopez@bren.es>
|
||||
*
|
||||
@ -60,6 +60,8 @@ enum PicChannelCode {
|
||||
|
||||
/**
|
||||
* The header for a SoftImage PIC file.
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
struct PicHeader {
|
||||
/**
|
||||
@ -111,6 +113,8 @@ struct PicHeader {
|
||||
|
||||
/**
|
||||
* Describes a channel in a SoftImage PIC file.
|
||||
*
|
||||
* @private
|
||||
*/
|
||||
struct PicChannel {
|
||||
quint8 size; /**< Bits per component per pixel. */
|
@ -17,7 +17,7 @@
|
||||
* not supported
|
||||
*/
|
||||
|
||||
#include "psd.h"
|
||||
#include "psd_p.h"
|
||||
|
||||
#include <QImage>
|
||||
#include <QtCore/QDataStream>
|
||||
|
@ -9,7 +9,7 @@
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
|
||||
#include "ras.h"
|
||||
#include "ras_p.h"
|
||||
|
||||
#include <QImage>
|
||||
#include <QtCore/QDataStream>
|
||||
|
@ -21,7 +21,7 @@
|
||||
* saved by this filter.
|
||||
*/
|
||||
|
||||
#include "rgb.h"
|
||||
#include "rgb_p.h"
|
||||
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QVector>
|
||||
|
@ -18,7 +18,7 @@
|
||||
* uncompressed true color tga files
|
||||
*/
|
||||
|
||||
#include "tga.h"
|
||||
#include "tga_p.h"
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "xcf.h"
|
||||
#include "xcf_p.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <QImage>
|
||||
@ -29,7 +29,7 @@
|
||||
#include <QtCore/QVector>
|
||||
// #include <QDebug>
|
||||
|
||||
#include "gimp.h"
|
||||
#include "gimp_p.h"
|
||||
|
||||
const float INCHESPERMETER = (100.0f / 2.54f);
|
||||
|
||||
|
Reference in New Issue
Block a user