Context Navigation

tv.c

Timestamp:

Jun 12, 2015, 9:26:15 PM (11 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20150419/Ohana/src/opihi

Files:

branches/eam_branches/ipp-20150419/Ohana/src/opihi
- Property svn:mergeinfo set to
  /branches/eam_branches/ipp-20150112/Ohana/src/opihi merged eligible
  /branches/eam_branches/ipp-20150405/Ohana/src/opihi merged eligible
  /trunk/Ohana/src/opihi merged eligible

Property svn:mergeinfo changed

/branches/eam_branches/ohana.20150429/src/opihi/cmd.data (added)	merged: 38330,38336,38338,38340-38341,38363,38367,38406,38410,38424,38440
/trunk/Ohana/src/opihi/cmd.data (added)	merged: 38234,38255,38441

r38062	r38443
71	71	int tooBig = buf[0].matrix.Naxis[2] ? (plane >= buf[0].matrix.Naxis[2]) : plane > 0;
72	72	if (tooBig) {
73		gprint (GP_ERR, " ERROR: -plane (plane) : out of bounds (%d vs %d)\n", plane, buf[0].matrix.Naxis[2]);
	73	gprint (GP_ERR, " ERROR: -plane (plane) : out of bounds (%d vs "OFF_T_FMT")\n", plane, buf[0].matrix.Naxis[2]);
74	74	return (FALSE);
75	75	}

Note: See TracChangeset for help on using the changeset viewer.

/branches/eam_branches/ipp-20150112/Ohana/src/opihi	merged	eligible
/branches/eam_branches/ipp-20150405/Ohana/src/opihi	merged	eligible
/trunk/Ohana/src/opihi	merged	eligible