← Back to branch summary

~ubuntu-branches/ubuntu/trusty/digikam/trusty

« back to all changes in this revision

Viewing changes to extra/libkdcraw/libraw/samples/postprocessing_benchmark.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg
  • Date: 2012-11-26 18:24:20 UTC
  • mfrom: (1.9.1) (3.1.23 experimental)
  • Revision ID: package-import@ubuntu.com-20121126182420-qoy6z0nx4ai0wzcl
Tags: 4:3.0.0~beta3-0ubuntu1
https://launchpad.net/bugs/890059
https://launchpad.net/bugs/1011211
https://launchpad.net/bugs/658047
* New upstream release
  - Add build-deps :  libhupnp-dev, libqtgstreamer-dev, libmagickcore-dev
* Merge from debian, remaining changes:
  - Make sure libqt4-opengl-dev, libgl1-mesa-dev and libglu1-mesa-dev only
    install on i386,amd64 and powerpc
  - Depend on libtiff-dev instead of libtiff4-dev
  - Drop digikam breaks/replaces kipi-plugins-common since we're past the
    LTS release now
  - digikam to recommend mplayerthumbs | ffmpegthumbs. We currently only
    have latter in the archives, even though former is also supposed to
    be part of kdemultimedia. (LP: #890059)
  - kipi-plugins to recommend www-browser rather than konqueror directly
    since 2.8 no direct usage of konqueror is present in the flickr
    plugin anymore (LP: #1011211)
  - Keep kubuntu_mysqld_executable_name.diff
  - Don't install libkipi translations
  - Keep deps on libcv-dev, libcvaux-dev
  - Keep split packaging of libraries
  - Replace icons from KDE 3 time in debian/xpm.d/*.xpm with the new
    versions (LP: #658047)
* Update debian/not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/libkdcraw/libraw/samples/postprocessing_benchmark.cpp
60
60
                "-s <num>       Select one raw image from input file\n"
61
61
                "-B <x y w h>   Crop output image\n"
62
62
                "-R <num>       Number of repetitions\n"
 
63
                                "-c             Dont use rawspeed\n"
63
64
                ,LibRaw::version(), LibRaw::cameraCount(),
64
65
                argv[0]);
65
66
            return 0;
106
107
                    OUT.shot_select = abs(atoi(argv[arg++])); 
107
108
                    break;
108
109
                case 'B':  
109
 
                    for(c=0; c<4;c++) OUT.cropbox[c]  = atoi(argv[arg++]); 
110
 
                    break;
 
110
                  for(c=0; c<4;c++) OUT.cropbox[c]  = atoi(argv[arg++]); 
 
111
                  break;
111
112
                case 'R':  
112
113
                    rep = abs(atoi(argv[arg++])); 
113
114
                    if(rep<1) rep = 1;
114
115
                    break;
 
116
                                case 'c':
 
117
                                        OUT.use_rawspeed = 0;
 
118
                                        break;
115
119
                default:
116
120
                    fprintf (stderr,"Unknown option \"-%c\".\n", opt);
117
121
                    return 1;
120
124
    for ( ; arg < argc; arg++)
121
125
        {
122
126
            printf("Processing file %s\n",argv[arg]);
123
 
            if( (ret = RawProcessor.open_file(argv[arg])) != LIBRAW_SUCCESS)
 
127
                        timerstart();
 
128
                        if( (ret = RawProcessor.open_file(argv[arg])) != LIBRAW_SUCCESS)
124
129
                {
125
130
                    fprintf(stderr,"Cannot open_file %s: %s\n",argv[arg],libraw_strerror(ret));
126
131
                    continue; // no recycle b/c open file will recycle itself
131
136
                    fprintf(stderr,"Cannot unpack %s: %s\n",argv[arg],libraw_strerror(ret));
132
137
                    continue;
133
138
                }
 
139
                        float qsec = timerend();
 
140
                        printf("\n%.1f msec for unpack\n",qsec);
134
141
            float mpix,rmpix;
135
142
            timerstart();
136
143
            for(c=0; c < rep; c++)