← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ginkgocadx/trusty

« back to all changes in this revision

Viewing changes to src/cadxcore/main/controllers/dcmtk/dicomstoreassociation.cpp

  • Committer: Package Import Robot
  • Author(s): Dmitry Smirnov
  • Date: 2013-07-21 11:58:53 UTC
  • mfrom: (7.2.1 sid)
  • Revision ID: package-import@ubuntu.com-20130721115853-44e7n1xujqglu78e
Tags: 3.4.0.928.29+dfsg-1
* New upstream release [July 2013]
  + new B-D: "libjsoncpp-dev".
  + new patch "unbundle-libjsoncpp.patch" to avoid building bundled
    "libjsoncpp-dev".
  + new patch "fix-wx.patch" to avoid FTBFS due to missing
    "-lwx_gtk2u_html-2.8".
* Removed unnecessary versioned Build-Depends.
* Removed obsolete lintian override.
* Reference get-orig-source implementation for orig.tar clean-up and
  DFSG-repackaging.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/controllers/dcmtk/dicomstoreassociation.cpp
854
854
 
855
855
                DicomStoreAssociation::~DicomStoreAssociation()
856
856
                {
857
 
#ifdef _WIN32
858
 
                        WSACleanup();
859
 
#endif
860
857
                        //no limpiamos no sea que los haya registrado otro que no seamos nosotros!!!
861
858
                        FreeMemory();
862
859
                }
863
860
 
864
 
                void DicomStoreAssociation::Store(ListaRutas listaFicheros, DicomServer* server, std::string nombreAETLocal,GNC::IProxyNotificadorProgreso* pNotificador, GIL::DICOM::TipoTransferSyntaxEnvio transferSyntax)
 
861
                void DicomStoreAssociation::Store(ListaRutas listaFicheros, const GNC::GCS::Ptr<DicomServer>& server, std::string nombreAETLocal,GNC::IProxyNotificadorProgreso* pNotificador, GIL::DICOM::TipoTransferSyntaxEnvio transferSyntax)
865
862
                {
866
863
                        if (listaFicheros.size() == 0)
867
864
                                return;
1082
1079
                                LOG_WARN(LOGGER, "Warning: no data dictionary loaded, check environment variable");
1083
1080
                        }
1084
1081
 
1085
 
#ifdef _WIN32
1086
 
                        WORD wVersionRequested;
1087
 
                        WSADATA wsaData;
1088
 
 
1089
 
                        wVersionRequested = MAKEWORD(1, 1);
1090
 
 
1091
 
                        WSAStartup(wVersionRequested, &wsaData);
1092
 
#endif
1093
 
 
1094
1082
                        /* initialize network, i.e. create an instance of T_ASC_Network*. */
1095
1083
 
1096
1084
                        cond = ASC_initializeNetwork(NET_REQUESTOR, puerto, opt_acse_timeout, &net);