# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
# target_branch: file:///home/hans/gnupdf/trunk/
# testament_sha1: 5111c830168da386544e6ec07e0f9fa1f3258f81
# timestamp: 2008-08-06 15:51:11 +0200
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'src/base/pdf-fsys-def.h'
--- src/base/pdf-fsys-def.h	2008-05-22 22:22:21 +0000
+++ src/base/pdf-fsys-def.h	2008-08-06 13:51:06 +0000
@@ -65,8 +65,8 @@
   pdf_fsys_disk_file_set_pos ((file), (new_pos))
 #define pdf_fsys_def_file_can_set_size_p(file, size) \
   pdf_fsys_disk_file_can_set_size_p ((file), (size))
-#define pdf_fsys_def_file_get_size(file, size) \
-  pdf_fsys_disk_file_get_size ((file), (size))
+#define pdf_fsys_def_file_get_size(file) \
+  pdf_fsys_disk_file_get_size ((file))
 #define pdf_fsys_def_file_set_size(file, size) \
   pdf_fsys_disk_file_set_size ((file), (size))
 #define pdf_fsys_def_file_read(file, elem_size, elem_count, data) \

=== modified file 'src/base/pdf-fsys-disk.c'
--- src/base/pdf-fsys-disk.c	2008-08-05 21:04:39 +0000
+++ src/base/pdf-fsys-disk.c	2008-08-06 13:51:06 +0000
@@ -695,12 +695,11 @@
   return PDF_TRUE;
 }
 
-pdf_status_t
-pdf_fsys_disk_file_get_size (pdf_fsys_file_t file, 
-                             pdf_size_t *size)
+pdf_size_t
+pdf_fsys_disk_file_get_size (pdf_fsys_file_t file)
 {
   /* FIXME: Please implement me :) */
-  return PDF_OK;
+  return 0;
 }
 
 pdf_status_t

=== modified file 'src/base/pdf-fsys-disk.h'
--- src/base/pdf-fsys-disk.h	2008-05-28 22:09:09 +0000
+++ src/base/pdf-fsys-disk.h	2008-08-06 13:51:06 +0000
@@ -75,8 +75,7 @@
                                          pdf_size_t new_pos);
 pdf_bool_t pdf_fsys_disk_file_can_set_size_p (pdf_fsys_file_t file,
                                               pdf_size_t size);
-pdf_status_t pdf_fsys_disk_file_get_size (pdf_fsys_file_t file, 
-                                          pdf_size_t *size);
+pdf_size_t pdf_fsys_disk_file_get_size (pdf_fsys_file_t file);
 pdf_status_t pdf_fsys_disk_file_set_size (pdf_fsys_file_t file,
                                           pdf_size_t size);
 pdf_size_t pdf_fsys_disk_file_read (pdf_fsys_file_t file,

=== modified file 'src/base/pdf-fsys.c'
--- src/base/pdf-fsys.c	2008-08-04 20:22:26 +0000
+++ src/base/pdf-fsys.c	2008-08-06 13:51:06 +0000
@@ -432,20 +432,18 @@
     }
 }
 
-pdf_status_t
-pdf_fsys_file_get_size (pdf_fsys_file_t file, 
-                        pdf_size_t *size)
+pdf_size_t
+pdf_fsys_file_get_size (pdf_fsys_file_t file)
 {
   if (file->fs == NULL)
     {
       /* Use the default filesystem */
-      return pdf_fsys_def_file_get_size(file, size);
+      return pdf_fsys_def_file_get_size(file);
     }
   else
     {
       return
-        (file->fs->implementation->file_get_size_fn) (file,
-                                                      size);
+        (file->fs->implementation->file_get_size_fn) (file);
     }
 }
 

=== modified file 'src/base/pdf-fsys.h'
--- src/base/pdf-fsys.h	2008-08-04 20:53:09 +0000
+++ src/base/pdf-fsys.h	2008-08-06 13:51:06 +0000
@@ -120,8 +120,7 @@
 typedef pdf_text_t (*pdf_fsys_get_temp_path_name_fn_t) (void);
 typedef pdf_bool_t (*pdf_fsys_file_can_set_size_p_fn_t) (pdf_fsys_file_t file,
                                                        pdf_size_t pos);
-typedef pdf_status_t (*pdf_fsys_file_get_size_fn_t) (pdf_fsys_file_t file,
-                                                     pdf_size_t *pos);
+typedef pdf_size_t (*pdf_fsys_file_get_size_fn_t) (pdf_fsys_file_t file);
 typedef pdf_status_t (*pdf_fsys_file_set_size_fn_t) (pdf_fsys_file_t file,
                                                      pdf_size_t pos);
 typedef pdf_status_t (*pdf_fsys_file_get_pos_fn_t) (pdf_fsys_file_t file,
@@ -230,8 +229,7 @@
                                     pdf_size_t new_pos);
 pdf_bool_t pdf_fsys_file_can_set_size_p (pdf_fsys_file_t file,
                                          pdf_size_t size);
-pdf_status_t pdf_fsys_file_get_size (pdf_fsys_file_t file, 
-                                     pdf_size_t *size);
+pdf_size_t pdf_fsys_file_get_size (pdf_fsys_file_t file);
 pdf_status_t pdf_fsys_file_set_size (pdf_fsys_file_t file,
                                      pdf_size_t size);
 pdf_size_t pdf_fsys_file_read (pdf_fsys_file_t file,

# Begin bundle
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
4p/8XckU4UJCY7gJ/A==