Skip to content

Commit

Permalink
Whitespaces cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
Laurent Monin committed Aug 25, 2008
1 parent d040508 commit f39b590
Show file tree
Hide file tree
Showing 37 changed files with 139 additions and 139 deletions.
4 changes: 2 additions & 2 deletions src/bar_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static GList *remove_duplicate_strings_from_list(GList *list)
g_hash_table_insert(hashtable, (gpointer) key, GINT_TO_POINTER(1));
newlist = g_list_prepend(newlist, key);
}
work = work->next;
work = work->next;
}

g_hash_table_destroy(hashtable);
Expand Down Expand Up @@ -434,7 +434,7 @@ gint comment_read(FileData *fd, GList **keywords, gchar **comment)
res2 = comment_legacy_read(fd, &keywords2, &comment2);

if (!res1 && !res2)
{
{
return FALSE;
}

Expand Down
4 changes: 2 additions & 2 deletions src/bar_sort.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ static void bar_sort_undo_folder(SortData *sd, GtkWidget *button)
case BAR_SORT_COPY:
file_util_delete(file_data_new_simple(sd->undo_dest), NULL, button);
break;
default:
default:
/* undo external command */
file_util_delete(file_data_new_simple(sd->undo_dest), NULL, button);
break;
Expand Down Expand Up @@ -286,7 +286,7 @@ static void bar_sort_bookmark_select_folder(SortData *sd, FileData *source, cons
list = NULL;
break;
default:
if (sd->action >= BAR_SORT_FILTER && sd->action < BAR_SORT_ACTION_COUNT)
if (sd->action >= BAR_SORT_FILTER && sd->action < BAR_SORT_ACTION_COUNT)
{
file_util_start_filter_from_filelist(sd->action - BAR_SORT_FILTER, list, path, sd->lw->window);
list = NULL;
Expand Down
2 changes: 1 addition & 1 deletion src/cellrenderericon.c
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ gqv_cell_renderer_icon_class_init(GQvCellRendererIconClass *class)
0, 32,
0,
G_PARAM_READWRITE));
toggle_cell_signals[TOGGLED] =
toggle_cell_signals[TOGGLED] =
g_signal_new ("toggled",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
Expand Down
2 changes: 1 addition & 1 deletion src/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (C) 2008 The Geeqie Team
*
* Authors: Vladimir Nadvornik / Laurent Monin
*
*
* This software is released under the GNU General Public License (GNU GPL).
* Please read the included file COPYING for more information.
* This software comes with no warranty of any kind, use at your own risk!
Expand Down
2 changes: 1 addition & 1 deletion src/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ gint get_debug_level(void)

void set_debug_level(gint new_level)
{
debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);
debug_level = CLAMP(new_level, DEBUG_LEVEL_MIN, DEBUG_LEVEL_MAX);
}

void debug_level_add(gint delta)
Expand Down
2 changes: 1 addition & 1 deletion src/editors.c
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,7 @@ gboolean is_valid_editor_command(gint n)
{
return (n >= 0 && n < GQ_EDITOR_SLOTS
&& options->editor[n].command
&& strlen(options->editor[n].command) > 0);
&& strlen(options->editor[n].command) > 0);
}

gint start_editor_from_filelist_full(gint n, GList *list, EditorCallback cb, gpointer data)
Expand Down
2 changes: 1 addition & 1 deletion src/exif.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,7 +1250,7 @@ ExifItem *exif_get_item(ExifData *exif, const gchar *key)

work = exif->items;
while (work)
{
{
ExifItem *item;

item = work->data;
Expand Down
54 changes: 27 additions & 27 deletions src/exiv2.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@


extern "C" {
#include <glib.h>
#include <glib.h>

#include "main.h"
#include "exif.h"
Expand Down Expand Up @@ -107,7 +107,7 @@ struct _ExifData
io.munmap();
if (!open) io.close();
}
#endif
#endif
}

~_ExifData()
Expand Down Expand Up @@ -255,20 +255,20 @@ ExifItem *exif_get_first_item(ExifData *exif)
#if EXIV2_TEST_VERSION(0,16,0)
exif->xmpIter = exif->xmpData().begin();
#endif
if (exif->exifIter != exif->exifData().end())
if (exif->exifIter != exif->exifData().end())
{
const Exiv2::Metadatum *item = &*exif->exifIter;
exif->exifIter++;
return (ExifItem *)item;
}
if (exif->iptcIter != exif->iptcData().end())
if (exif->iptcIter != exif->iptcData().end())
{
const Exiv2::Metadatum *item = &*exif->iptcIter;
exif->iptcIter++;
return (ExifItem *)item;
}
#if EXIV2_TEST_VERSION(0,16,0)
if (exif->xmpIter != exif->xmpData().end())
if (exif->xmpIter != exif->xmpData().end())
{
const Exiv2::Metadatum *item = &*exif->xmpIter;
exif->xmpIter++;
Expand Down Expand Up @@ -386,7 +386,7 @@ invalidTypeId, unsignedByte, asciiString, unsignedShort,
signedShort, signedLong, signedRational, string,
date, time, comment, directory,
xmpText, xmpAlt, xmpBag, xmpSeq,
langAlt, lastTypeId
langAlt, lastTypeId
*/

static guint format_id_trans_tbl [] = {
Expand Down Expand Up @@ -482,10 +482,10 @@ gchar *exif_item_get_string(ExifItem *item, int idx)
std::string str = em->toString(); // FIXME
#endif
if (idx == 0 && str == "") str = em->toString();
if (str.length() > 5 && str.substr(0, 5) == "lang=")
if (str.length() > 5 && str.substr(0, 5) == "lang=")
{
std::string::size_type pos = str.find_first_of(' ');
if (pos != std::string::npos) str = str.substr(pos+1);
std::string::size_type pos = str.find_first_of(' ');
if (pos != std::string::npos) str = str.substr(pos+1);
}

return g_strdup(str.c_str());
Expand Down Expand Up @@ -573,7 +573,7 @@ int exif_item_delete(ExifData *exif, ExifItem *item)
return 1;
}
}
#endif
#endif
return 0;
}
catch (Exiv2::AnyError& e) {
Expand Down Expand Up @@ -605,19 +605,19 @@ unsigned char *exif_get_color_profile(ExifData *exif, guint *data_len)

}

/* This is a dirty hack to support raw file preview, bassed on
/* This is a dirty hack to support raw file preview, bassed on
tiffparse.cpp from Exiv2 examples */

class RawFile {
public:

RawFile(int fd);
~RawFile();

const Exiv2::Value *find(uint16_t tag, uint16_t group);

unsigned long preview_offset();

private:
int type;
Exiv2::TiffComponent::AutoPtr rootDir;
Expand Down Expand Up @@ -664,16 +664,16 @@ RawFile::RawFile(int fd) : map_data(NULL), map_len(0), offset(0)
#endif
#if EXIV2_TEST_VERSION(0,13,0)
case Exiv2::ImageType::raf:
if (map_len < 84 + 4) throw Error(14);
offset = getULong(map_data + 84, bigEndian);
if (map_len < 84 + 4) throw Error(14);
offset = getULong(map_data + 84, bigEndian);
return;
#endif
case Exiv2::ImageType::crw:
{
// Parse the image, starting with a CIFF header component
Exiv2::CiffHeader::AutoPtr parseTree(new Exiv2::CiffHeader);
parseTree->read(map_data, map_len);
CiffComponent *entry = parseTree->findComponent(0x2007, 0);
CiffComponent *entry = parseTree->findComponent(0x2007, 0);
if (entry) offset = entry->pData() - map_data;
return;
}
Expand All @@ -688,7 +688,7 @@ RawFile::RawFile(int fd) : map_data(NULL), map_len(0), offset(0)

rootDir = createFct(Tag::root, Group::none);
if (0 == rootDir.get()) {
throw Error(1, "No root element defined in TIFF structure");
throw Error(1, "No root element defined in TIFF structure");
}

if (tiffHeader)
Expand All @@ -709,15 +709,15 @@ RawFile::RawFile(int fd) : map_data(NULL), map_len(0), offset(0)
TiffRwState::AutoPtr state(new TiffRwState(tiffHeader ? tiffHeader->byteOrder() : littleEndian, 0, createFct));

TiffReader reader(map_data,
map_len,
rootDir.get(),
state);
map_len,
rootDir.get(),
state);

rootDir->accept(reader);

if (tiffHeader)
if (tiffHeader)
delete tiffHeader;
if (cr2Header)
if (cr2Header)
delete cr2Header;
}

Expand Down Expand Up @@ -752,7 +752,7 @@ unsigned long RawFile::preview_offset(void)
{
val = find(0x111, Group::ifd0);
if (val) return val->toLong();

return 0;
}

Expand All @@ -761,7 +761,7 @@ unsigned long RawFile::preview_offset(void)

val = find(0x201, Group::ifd0);
if (val) return val->toLong();

val = find(0x201, Group::ignr); // for PEF files, originally it was probably ifd2
if (val) return val->toLong();

Expand Down Expand Up @@ -809,5 +809,5 @@ extern "C" gint format_raw_img_exif_offsets_fd(int fd, const gchar *path,
}


#endif
#endif
/* HAVE_EXIV2 */
4 changes: 2 additions & 2 deletions src/filecache.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void file_cache_set_size(FileCacheData *fc, gulong size)
{
GList *prev;
last_fe = work->data;
prev = work->prev;
prev = work->prev;
fc->list = g_list_delete_link(fc->list, work);
work = prev;

Expand Down Expand Up @@ -146,7 +146,7 @@ static void file_cache_remove_fd(FileCacheData *fc, FileData *fd)
{
GList *current = work;
fe = work->data;
work = work->next;
work = work->next;

if (fe->fd == fd)
{
Expand Down
Loading

0 comments on commit f39b590

Please sign in to comment.