Branch: master

e2dc3a2f 2019-11-03 21:29:48 Chris 
Fix KSnapshot desktop file.

Signed-off-by: Chris <xchrisx@...>
M ksnapshot/ksnapshot.desktop

ksnapshot/ksnapshot.desktop

diff --git a/ksnapshot/ksnapshot.desktop b/ksnapshot/ksnapshot.desktop
index ccb9003..7b7b3ae 100644
--- a/ksnapshot/ksnapshot.desktop
+++ b/ksnapshot/ksnapshot.desktop
@@ -8,7 +8,7 @@
 GenericName[cs]=Snímač obrazovky
 GenericName[cy]=Rhaglen Cipio'r Sgrîn
 GenericName[da]=Program til øjebliksbilleder
-GenericName[de]=Bildschirmphotos
+GenericName[de]=Bildschirmfotos
 GenericName[el]=Πρόγραμμα σύλληψης οθόνης
 GenericName[eo]=Ekranfota programo
 GenericName[es]=Capturador de pantalla
@@ -64,26 +64,12 @@
 GenericName[zh_HK]=螢幕擷取程式
 GenericName[zh_TW]=畫面擷取程式
 GenericName[zu]=Iprogremu Yokubamba Isikrini
+
 Name=KSnapshot
-Name[af]=K-kiekie
-Name[cy]=KCipluniau
-Name[eo]=Ekranfotilo
-Name[fr]=KSnapShot
 Name[hi]=के-स्नेपशॉट
-Name[lv]=KSnapšots
-Name[ne]=केडीई स्न्यापसट
-Name[pl]=Zrzuty ekranu
-Name[sv]=Ksnapshot
-Name[ta]=கேதிரையை நகலெடுத்தல்
-Name[th]=จับภาพ - K
-Name[ven]=Tshinepe tsha K
-Name[wa]=KWaitroûlêye
-Name[zh_TW]=KSnapshot 快照
-Name[zu]=KEsincane isithombe
-MimeType=
+
 Exec=ksnapshot -caption "%c" %i %m
 Icon=ksnapshot
-Path=
 Type=Application
 Terminal=false
 X-DocPath=ksnapshot/index.html
baa8c7b1 2019-11-06 02:38:46 OBATA Akio 
Properly declare function argment type

Signed-off-by: OBATA Akio <obache@...>
M tdefile-plugins/raw/parse.c

tdefile-plugins/raw/parse.c

diff --git a/tdefile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c
index a256f04..467b057 100644
--- a/tdefile-plugins/raw/parse.c
+++ b/tdefile-plugins/raw/parse.c
@@ -118,7 +118,7 @@
 
 int parse_tiff_ifd (int base, int level);
 
-void nef_parse_makernote (base)
+void nef_parse_makernote (int base)
 {
   int offset=0, entries, tag, type, count, val, save;
   unsigned serial=0, key=0;

Branch: r14.0.x

2d6869d0 2019-11-06 11:01:55 OBATA Akio 
Properly declare function argment type

Signed-off-by: OBATA Akio <obache@...>
(cherry picked from commit baa8c7b126324bec8bcfdc89a917e0d4886530c6)
M tdefile-plugins/raw/parse.c

tdefile-plugins/raw/parse.c

diff --git a/tdefile-plugins/raw/parse.c b/tdefile-plugins/raw/parse.c
index a256f04..467b057 100644
--- a/tdefile-plugins/raw/parse.c
+++ b/tdefile-plugins/raw/parse.c
@@ -118,7 +118,7 @@
 
 int parse_tiff_ifd (int base, int level);
 
-void nef_parse_makernote (base)
+void nef_parse_makernote (int base)
 {
   int offset=0, entries, tag, type, count, val, save;
   unsigned serial=0, key=0;