Diff of /adjust.c [9e3e0a] .. [f5f394]  Maximize  Restore

  Switch to unified view

a/adjust.c b/adjust.c
...
...
96
                    memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
96
                    memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
97
                }
97
                }
98
98
99
                TrPtr->interpolator = aP.interpolator;
99
                TrPtr->interpolator = aP.interpolator;
100
                TrPtr->gamma        = aP.gamma;
100
                TrPtr->gamma        = aP.gamma;
101
                TrPtr->fastStep     = aP.fastStep;
101
                    
102
                    
102
#if 0
103
#if 0
103
                int readmode = 1;
104
                int readmode = 1;
104
                aPtr = &aP;
105
                aPtr = &aP;
105
                gsPrPtr->interpolator   = TrPtr->interpolator;
106
                gsPrPtr->interpolator   = TrPtr->interpolator;
106
                gsPrPtr->gamma          = TrPtr->gamma;
107
                gsPrPtr->gamma          = TrPtr->gamma;
108
                gsPrPtr->fastStep     = TrPtr->fastStep;
107
                if( TrPtr->mode & _destSupplied ){
109
                if( TrPtr->mode & _destSupplied ){
108
                    PTRect* p = &TrPtr->dest->selection;
110
                    PTRect* p = &TrPtr->dest->selection;
109
                    if( !(p->bottom == 0 && p->right == 0) &&
111
                    if( !(p->bottom == 0 && p->right == 0) &&
110
                        !(p->right == TrPtr->dest->width &&
112
                        !(p->right == TrPtr->dest->width &&
111
                         p->bottom == TrPtr->dest->height) )
113
                         p->bottom == TrPtr->dest->height) )
...
...
123
                    memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
125
                    memcpy( &prefs->sBuf, &aP.sBuf, sizeof( stBuf ) );
124
                }
126
                }
125
                // Use modevalues read from script
127
                // Use modevalues read from script
126
                TrPtr->interpolator = gsPrPtr->interpolator;
128
                TrPtr->interpolator = gsPrPtr->interpolator;
127
                TrPtr->gamma        = gsPrPtr->gamma;
129
                TrPtr->gamma        = gsPrPtr->gamma;
130
                TrPtr->fastStep     = gsPrPtr->fastStep;
128
                
131
                
129
                // Parse script again, now reading triangles if morphing requested
132
                // Parse script again, now reading triangles if morphing requested
130
                if( aPtr->im.cP.correction_mode & correction_mode_morph )
133
                if( aPtr->im.cP.correction_mode & correction_mode_morph )
131
                {
134
                {
132
                    char*               script;
135
                    char*               script;
...
...
2186
2189
2187
2190
2188
void SetAdjustDefaults( aPrefs *prefs )
2191
void SetAdjustDefaults( aPrefs *prefs )
2189
{
2192
{
2190
2193
2191
  prefs->magic        =   50;                 //  File validity check, must be 50
2194
    prefs->magic        =   50;                 //  File validity check, must be 50
2192
  prefs->mode         =   _insert;            //  
2195
    prefs->mode         =   _insert;            //  
2193
  
2196
    
2194
  SetImageDefaults( &(prefs->im) );
2197
    SetImageDefaults( &(prefs->im) );
2195
  SetImageDefaults( &(prefs->pano) );
2198
    SetImageDefaults( &(prefs->pano) );
2196
  
2199
    
2197
  SetStitchDefaults( &(prefs->sBuf) ); 
2200
    SetStitchDefaults( &(prefs->sBuf) );    
2198
2201
2199
  memset( &(prefs->scriptFile), 0, sizeof( fullPath ) );
2202
    memset( &(prefs->scriptFile), 0, sizeof( fullPath ) );
2200
  
2203
    
2201
  prefs->nt = 0;
2204
    prefs->nt           = 0;
2202
  prefs->ts = NULL;
2205
    prefs->ts           = NULL;
2203
  prefs->td = NULL;
2206
    prefs->td           = NULL;
2204
  
2207
    
2205
  prefs->interpolator = _poly3;
2208
    prefs->interpolator = _spline36;
2206
  prefs->gamma = 1.0;
2209
    prefs->gamma        = 1.0;
2210
    prefs->fastStep     = FAST_TRANSFORM_STEP_NONE;
2207
}
2211
}
2208
2209
2210
2211
2212
2212
                
2213
                
2213
2214
2214
void    DisposeAlignInfo( struct AlignInfo *g )
2215
void    DisposeAlignInfo( struct AlignInfo *g )
2215
{
2216
{