liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finally fully remove the safegtk module.

Browse Source
This commit is contained in:
Adam Reichold
2015-12-26 16:22:06 +01:00
parent 1297f4b2ec
commit a2eea7c265
51 changed files with 132 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtengine/rtthumbnail.cc
View File

@@ -34,7 +34,6 @@
#include <glib/gstdio.h>
#include <csetjmp>
#include "safekeyfile.h"
#include "safegtk.h"
#include "rawimage.h"
#include "jpeg.h"
#include "../rtgui/ppversion.h"
@@ -1653,7 +1652,7 @@ bool Thumbnail::writeImage (const Glib::ustring& fname, int format)
Glib::ustring fullFName = fname + ".rtti";
FILE* f = safe_g_fopen (fullFName, "wb");
FILE* f = g_fopen (fullFName.c_str (), "wb");
if (!f) {
return false;
@@ -1692,11 +1691,11 @@ bool Thumbnail::readImage (const Glib::ustring& fname)
Glib::ustring fullFName = fname + ".rtti";
if (!safe_file_test (fullFName, Glib::FILE_TEST_EXISTS)) {
if (!Glib::file_test (fullFName, Glib::FILE_TEST_EXISTS)) {
return false;
}
FILE* f = safe_g_fopen (fullFName, "rb");
FILE* f = g_fopen (fullFName.c_str (), "rb");
if (!f) {
return false;
@@ -1837,7 +1836,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname)
MyMutex::MyLock thmbLock(thumbMutex);
try {
if( safe_file_test(fname, Glib::FILE_TEST_EXISTS) ) {
if( Glib::file_test(fname, Glib::FILE_TEST_EXISTS) ) {
keyFile.load_from_file (fname);
}
} catch (Glib::Error &err) {
@@ -1867,7 +1866,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname)
Glib::ArrayHandle<double> cm ((double*)colorMatrix, 9, Glib::OWNERSHIP_NONE);
keyFile.set_double_list ("LiveThumbData", "ColorMatrix", cm);
FILE *f = safe_g_fopen (fname, "wt");
FILE *f = g_fopen (fname.c_str (), "wt");
if (!f) {
if (options.rtSettings.verbose) {
@@ -1886,7 +1885,7 @@ bool Thumbnail::writeData (const Glib::ustring& fname)
bool Thumbnail::readEmbProfile (const Glib::ustring& fname)
{
FILE* f = safe_g_fopen (fname, "rb");
FILE* f = g_fopen (fname.c_str (), "rb");
if (!f) {
embProfileData = NULL;
@@ -1910,7 +1909,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname)
{
if (embProfileData) {
FILE* f = safe_g_fopen(fname, "wb");
FILE* f = g_fopen(fname.c_str (), "wb");
if (f) {
fwrite (embProfileData, 1, embProfileLength, f);
@@ -1925,7 +1924,7 @@ bool Thumbnail::writeEmbProfile (const Glib::ustring& fname)
bool Thumbnail::readAEHistogram (const Glib::ustring& fname)
{
FILE* f = safe_g_fopen (fname, "rb");
FILE* f = g_fopen (fname.c_str (), "rb");
if (!f) {
aeHistogram(0);
@@ -1943,7 +1942,7 @@ bool Thumbnail::writeAEHistogram (const Glib::ustring& fname)
{
if (aeHistogram) {
FILE* f = safe_g_fopen (fname, "wb");
FILE* f = g_fopen (fname.c_str (), "wb");
if (f) {
fwrite (&aeHistogram[0], 1, (65536 >> aeHistCompression)*sizeof(aeHistogram[0]), f);