ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/tonemap.c
(Generate patch)

Comparing ray/src/common/tonemap.c (file contents):
Revision 3.30 by greg, Tue Nov 27 02:42:54 2007 UTC vs.
Revision 3.31 by greg, Thu Jul 3 03:30:21 2008 UTC

# Line 363 | Line 363 | int    wt
363                  tms->hbrmin = tms->hbrmax = ls[i];
364                  oldlen = 0;
365          } else {
366 <                oldorig = (tms->hbrmin-MINBRT)/HISTEP;
367 <                oldlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - oldorig;
366 >                oldorig = HISTI(tms->hbrmin);
367 >                oldlen = HISTI(tms->hbrmax) + 1 - oldorig;
368          }
369          for (i = len; i--; ) {
370                  if ((j = ls[i]) < MINBRT)
# Line 374 | Line 374 | int    wt
374                  else if (j > tms->hbrmax)
375                          tms->hbrmax = j;
376          }
377 <        horig = (tms->hbrmin-MINBRT)/HISTEP;
378 <        hlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - horig;
377 >        horig = HISTI(tms->hbrmin);
378 >        hlen = HISTI(tms->hbrmax) + 1 - horig;
379          if (hlen > oldlen) {                    /* (re)allocate histogram */
380                  int     *newhist = (int *)calloc(hlen, sizeof(int));
381                  if (newhist == NULL)
# Line 391 | Line 391 | int    wt
391                  returnOK;
392          for (i = len; i--; )                    /* add in new counts */
393                  if (ls[i] >= MINBRT)
394 <                        tms->histo[ (ls[i]-MINBRT)/HISTEP - horig ] += wt;
394 >                        tms->histo[ HISTI(ls[i]) - horig ] += wt;
395          returnOK;
396   }
397  
# Line 496 | Line 496 | double Ldmax
496          Ldmin = Ldmax/Lddyn;
497          logLddyn = log(Lddyn);
498          Ldavg = sqrt(Ldmax*Ldmin);
499 <        i = (tms->hbrmin-MINBRT)/HISTEP;
499 >        i = HISTI(tms->hbrmin);
500          brt0 = MINBRT + HISTEP/2 + i*HISTEP;
501 <        histlen = (tms->hbrmax-MINBRT)/HISTEP + 1 - i;
501 >        histlen = HISTI(tms->hbrmax) + 1 - i;
502                                          /* histogram total and mean */
503          histot = 0; sum = 0;
504          j = brt0 + histlen*HISTEP;
# Line 633 | Line 633 | TMstruct       *tms
633                  return(NULL);
634          *tmnew = *tms;          /* copy everything */
635          if (tmnew->histo != NULL) {     /* duplicate histogram */
636 <                len = (tmnew->hbrmax-MINBRT)/HISTEP + 1 -
637 <                                (tmnew->hbrmin-MINBRT)/HISTEP;
636 >                len = HISTI(tmnew->hbrmax) + 1 - HISTI(tmnew->hbrmin);
637                  tmnew->histo = (int *)malloc(len*sizeof(int));
638                  if (tmnew->histo != NULL)
639                          for (i = len; i--; )

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines