Commits

Darrell Schiebel authored 274da23d872
adjustments for casacore update [CAS-14106]

src/guitools/Feather/FeatherThread.cc

Modified
313 313 ImageInterface<float>* FeatherThread::addMissingAxes( ImageInterface<float>* firstImage ){
314 314 TempImage<float>* convolvedImage = NULL;
315 315 if ( firstImage != NULL ){
316 316 CoordinateSystem cSys = firstImage->coordinates();
317 317 CountedPtr<ImageInterface<Float> > firstCopy;
318 318 firstCopy=new TempImage<Float>(firstImage->shape(), cSys);
319 319 (*firstCopy).copyData(*firstImage);
320 320 ImageUtilities::copyMiscellaneous(*firstCopy, *firstImage);
321 321 if(firstImage->getDefaultMask() != "")
322 322 Imager::copyMask(*firstCopy, *firstImage, firstImage->getDefaultMask());
323 - PtrHolder<ImageInterface<Float> > copyPtr;
324 - PtrHolder<ImageInterface<Float> > copyPtr2;
323 + std::unique_ptr<ImageInterface<Float> > copyPtr;
324 + std::unique_ptr<ImageInterface<Float> > copyPtr2;
325 325 Vector<Stokes::StokesTypes> stokesvec;
326 326 if(CoordinateUtil::findStokesAxis(stokesvec, cSys) <0){
327 327 CoordinateUtil::addIAxis(cSys);
328 328 ImageUtilities::addDegenerateAxes (*logger, copyPtr, *firstCopy, "",
329 329 false, false,"I", false, false, true);
330 - firstCopy=CountedPtr<ImageInterface<Float> >(copyPtr.ptr(), false);
330 + firstCopy=CountedPtr<ImageInterface<Float> >(copyPtr.get( ), false);
331 331 }
332 332 if(CoordinateUtil::findSpectralAxis(cSys) <0){
333 333 CoordinateUtil::addFreqAxis(cSys);
334 334 ImageUtilities::addDegenerateAxes (*logger, copyPtr2, *firstCopy, "",
335 335 false, true,
336 336 "", false, false,
337 337 true);
338 - firstCopy=CountedPtr<ImageInterface<Float> >(copyPtr2.ptr(), false);
338 + firstCopy=CountedPtr<ImageInterface<Float> >(copyPtr2.get(), false);
339 339 }
340 340
341 341
342 342 convolvedImage=new TempImage<Float>(firstCopy->shape(), cSys);
343 343
344 344 convolvedImage->copyData(*firstCopy);
345 345 ImageUtilities::copyMiscellaneous(*convolvedImage, *firstCopy);
346 346 String maskname=firstCopy->getDefaultMask();
347 347 if(maskname != ""){
348 348 Imager::copyMask(*convolvedImage, *firstCopy, maskname);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut