summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/desktopfiles/gwenview.desktop2
-rw-r--r--src/gvcore/qxcfi.cpp2
-rw-r--r--src/gvimagepart/gvimagepart.desktop2
-rw-r--r--src/imageutils/jpegint.h19
-rw-r--r--src/imageutils/transupp.c28
-rw-r--r--translations/desktop_files/ru.po22
6 files changed, 30 insertions, 45 deletions
diff --git a/src/desktopfiles/gwenview.desktop b/src/desktopfiles/gwenview.desktop
index d3aa1c7..92beddf 100644
--- a/src/desktopfiles/gwenview.desktop
+++ b/src/desktopfiles/gwenview.desktop
@@ -11,5 +11,5 @@ Icon=gwenview
Exec=gwenview %u -caption "%c" %i %m
Terminal=false
Categories=Qt;TDE;Graphics;
-MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-pcx;image/x-bmp;image/png;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/x-targa;image/svg+xml;
+MimeType=image/gif;image/x-xpm;image/x-xbm;image/jpeg;image/x-pcx;image/x-bmp;image/png;image/webp;image/x-ico;image/x-portable-bitmap;image/x-portable-pixmap;image/x-portable-greymap;image/tiff;image/x-targa;image/svg+xml;
X-DocPath=gwenview/index.html
diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp
index afd414f..e07fd4a 100644
--- a/src/gvcore/qxcfi.cpp
+++ b/src/gvcore/qxcfi.cpp
@@ -2400,6 +2400,6 @@ void XCFImageFormat::dissolveAlphaPixels ( TQImage& image, int x, int y )
}
}
-KDE_Q_EXPORT_PLUGIN( XCFImageFormat )
+TDE_EXPORT_PLUGIN( XCFImageFormat )
} // namespace
diff --git a/src/gvimagepart/gvimagepart.desktop b/src/gvimagepart/gvimagepart.desktop
index ae018d6..76c2c84 100644
--- a/src/gvimagepart/gvimagepart.desktop
+++ b/src/gvimagepart/gvimagepart.desktop
@@ -2,7 +2,7 @@
Type=Service
Name=Gwenview Image Viewer
Icon=gwenview
-MimeType=image/gif;image/jpeg;image/png;image/x-bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbm;image/x-xpm
+MimeType=image/gif;image/jpeg;image/png;image/webp;image/x-bmp;image/x-eps;image/x-ico;image/x-krl;image/x-portable-bitmap;image/x-portable-pixmap;image/x-xbm;image/x-xpm
X-TDE-ServiceTypes=KParts/ReadOnlyPart
X-TDE-Library=libgvimagepart
X-TDE-InitialPreference=5
diff --git a/src/imageutils/jpegint.h b/src/imageutils/jpegint.h
index bf01aa3..21a0146 100644
--- a/src/imageutils/jpegint.h
+++ b/src/imageutils/jpegint.h
@@ -14,11 +14,6 @@
*/
-/* Ensuring definition INT32 */
-#ifndef INT32
-#define INT32 TQ_INT32
-#endif
-
/* Declarations for both compression & decompression */
typedef enum { /* Operating modes for buffer controllers */
@@ -280,16 +275,16 @@ struct jpeg_color_quantizer {
* shift" instructions that shift in copies of the sign bit. But some
* C compilers implement >> with an unsigned shift. For these machines you
* must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * RIGHT_SHIFT provides a proper signed right shift of an int32_t quantity.
* It is only applied with constant shift counts. SHIFT_TEMPS must be
* included in the variables of any routine using RIGHT_SHIFT.
*/
#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS INT32 shift_temp;
+#define SHIFT_TEMPS int32_t shift_temp;
#define RIGHT_SHIFT(x,shft) \
((shift_temp = (x)) < 0 ? \
- (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+ (shift_temp >> (shft)) | ((~((int32_t) 0)) << (32-(shft))) : \
(shift_temp >> (shft)))
#else
#define SHIFT_TEMPS
@@ -402,7 +397,7 @@ extern const int jpeg_natural_order3[]; /* zz to natural order for 3x3 block */
extern const int jpeg_natural_order2[]; /* zz to natural order for 2x2 block */
/* Arithmetic coding probability estimation tables in jaricom.c */
-extern const INT32 jpeg_aritab[];
+extern const int32_t jpeg_aritab[];
/* Suppress undefined-structure complaints if necessary. */
@@ -691,16 +686,16 @@ struct jpeg_color_quantizer {
* shift" instructions that shift in copies of the sign bit. But some
* C compilers implement >> with an unsigned shift. For these machines you
* must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
+ * RIGHT_SHIFT provides a proper signed right shift of an int32_t quantity.
* It is only applied with constant shift counts. SHIFT_TEMPS must be
* included in the variables of any routine using RIGHT_SHIFT.
*/
#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS INT32 shift_temp;
+#define SHIFT_TEMPS int32_t shift_temp;
#define RIGHT_SHIFT(x,shft) \
((shift_temp = (x)) < 0 ? \
- (shift_temp >> (shft)) | ((~((INT32) 0)) << (32-(shft))) : \
+ (shift_temp >> (shft)) | ((~((int32_t) 0)) << (32-(shft))) : \
(shift_temp >> (shft)))
#else
#define SHIFT_TEMPS
diff --git a/src/imageutils/transupp.c b/src/imageutils/transupp.c
index 0ede0db..8003c48 100644
--- a/src/imageutils/transupp.c
+++ b/src/imageutils/transupp.c
@@ -1,8 +1,16 @@
#include <stdlib.h>
#include <stdio.h>
#include <jpeglib.h>
+#include <jpegint.h>
#include <jerror.h>
+/* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row(). */
+#define JPEG_INTERNALS
+
+#include "jinclude.h"
+#include "transupp.h" /* My own external interface */
+
#if JPEG_LIB_VERSION >= 80
/*
@@ -19,14 +27,6 @@
* interfaces.
*/
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h" /* My own external interface */
#include <ctype.h> /* to declare isdigit() */
@@ -1591,8 +1591,6 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
#else // JPEG_LIB_VERSION >= 80
-#include <jpegint.h>
-
/*
* transupp.c
*
@@ -1607,16 +1605,6 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
* interfaces.
*/
-/* Although this file really shouldn't have access to the library internals,
- * it's helpful to let it call jround_up() and jcopy_block_row().
- */
-#define JPEG_INTERNALS
-
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "transupp.h" /* My own external interface */
-
-
#if TRANSFORMS_SUPPORTED
/*
diff --git a/translations/desktop_files/ru.po b/translations/desktop_files/ru.po
index 99ee8c3..7059444 100644
--- a/translations/desktop_files/ru.po
+++ b/translations/desktop_files/ru.po
@@ -1,25 +1,27 @@
# SOME DESCRIPTIVE TITLE.
# This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Andrei Stepanov <adem4ik@gmail.com>, 2024.
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-13 14:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2024-05-14 18:01+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/gwenview-desktop-files/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
#. Name
#: desktopfiles/gwenview.desktop:4
msgid "Gwenview"
-msgstr ""
+msgstr "Gwenview"
#. GenericName
#: desktopfiles/gwenview.desktop:6
@@ -44,7 +46,7 @@ msgstr "Просмотр изображений"
#. Name
#: gvimagepart/gvimagepart.desktop:3
msgid "Gwenview Image Viewer"
-msgstr "Gwenview"
+msgstr "Gwenview — просмотрщик изображений"
#. Name
#: tools/gimp.desktop:2
@@ -54,12 +56,12 @@ msgstr "GIMP"
#. Name
#: tools/kolourpaint.desktop:2
msgid "KolourPaint"
-msgstr ""
+msgstr "KolourPaint"
#. Name
#: tools/konqueror.desktop:2
msgid "Konqueror"
-msgstr ""
+msgstr "Konqueror"
#. Name
#: tools/tiledwallpaper.desktop:2
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-04 18:40:02 +0000