Reformat whole codebase with astyle.options (#128)

1 files changed, 54 insertions, 53 deletions

diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c
index 19570af5..6cd2604d 100644
--- a/src/bin/jpip/opj_jpip_transcode.c
+++ b/src/bin/jpip/opj_jpip_transcode.c
@@ -44,23 +44,25 @@
  */
 static int jpip_to_jp2(char *argv[])
 {
-  jpip_dec_param_t *dec;
-    
-  dec = init_jpipdecoder( OPJ_TRUE);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return 1;
-  
-  decode_jpip( dec);
-  
-  if(!(fwrite_jp2k( argv[2], dec)))
-    return 1;
+    jpip_dec_param_t *dec;
+
+    dec = init_jpipdecoder(OPJ_TRUE);
 
-  /* output_log( OPJ_TRUE, OPJ_FALSE, OPJ_TRUE, dec); */
+    if (!(fread_jpip(argv[1], dec))) {
+        return 1;
+    }
+
+    decode_jpip(dec);
 
-  destroy_jpipdecoder( &dec);
+    if (!(fwrite_jp2k(argv[2], dec))) {
+        return 1;
+    }
 
-  return 0;
+    /* output_log( OPJ_TRUE, OPJ_FALSE, OPJ_TRUE, dec); */
+
+    destroy_jpipdecoder(&dec);
+
+    return 0;
 }
 
 /*! \file
@@ -76,49 +78,48 @@ static int jpip_to_jp2(char *argv[])
  */
 static int jpip_to_j2k(char *argv[])
 {
-  jpip_dec_param_t *dec;
-  
-  dec = init_jpipdecoder( OPJ_FALSE);
-  
-  if(!( fread_jpip( argv[1], dec)))
-    return 1;
-  
-  decode_jpip( dec);
-  
-  if(!(fwrite_jp2k( argv[2], dec)))
-    return 1;
-  
-  /*  output_log( OPJ_TRUE, OPJ_FALSE, OPJ_FALSE, dec); */
-  
-  destroy_jpipdecoder( &dec);
+    jpip_dec_param_t *dec;
+
+    dec = init_jpipdecoder(OPJ_FALSE);
 
-  return 0;
+    if (!(fread_jpip(argv[1], dec))) {
+        return 1;
+    }
+
+    decode_jpip(dec);
+
+    if (!(fwrite_jp2k(argv[2], dec))) {
+        return 1;
+    }
+
+    /*  output_log( OPJ_TRUE, OPJ_FALSE, OPJ_FALSE, dec); */
+
+    destroy_jpipdecoder(&dec);
+
+    return 0;
 }
 
-int main(int argc,char *argv[])
+int main(int argc, char *argv[])
 {
-  char *ext;
-  if( argc < 3){
-    fprintf( stderr, "Too few arguments:\n");
-    fprintf( stderr, " - input  jpt or jpp file\n");
-    fprintf( stderr, " - output j2k file\n");
-    return 1;
-  }
-  
-  ext = strrchr( argv[2], '.' );
-  if( ext )
-    {
-    /* strcasecmp ? */
-    if( strcmp(ext, ".jp2" ) == 0 )
-      {
-      return jpip_to_jp2(argv);
-      }
-    if( strcmp(ext, ".j2k" ) == 0 )
-      {
-      return jpip_to_j2k(argv);
-      }
+    char *ext;
+    if (argc < 3) {
+        fprintf(stderr, "Too few arguments:\n");
+        fprintf(stderr, " - input  jpt or jpp file\n");
+        fprintf(stderr, " - output j2k file\n");
+        return 1;
     }
 
-  fprintf( stderr, "Invalid file extension for output file: %s\n", argv[2]);
-  return 1;
+    ext = strrchr(argv[2], '.');
+    if (ext) {
+        /* strcasecmp ? */
+        if (strcmp(ext, ".jp2") == 0) {
+            return jpip_to_jp2(argv);
+        }
+        if (strcmp(ext, ".j2k") == 0) {
+            return jpip_to_j2k(argv);
+        }
+    }
+
+    fprintf(stderr, "Invalid file extension for output file: %s\n", argv[2]);
+    return 1;
 }